mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 06:35:42 +00:00
Fix for bug 22338, 27171, 36939 and part of bug 35038. Some UI and autocomplete cleanup.
This commit is contained in:
parent
61440864c7
commit
b940ba20c8
@ -43,9 +43,9 @@ Rights Reserved.
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell allowevents="true">
|
||||
<!--menulist id="msgRecipientType#1" style="width:0px"
|
||||
<menulist id="msgRecipientType#1"
|
||||
onclick="awNotAnEmptyArea(event)"
|
||||
onchange="contentChanged=true;">
|
||||
oncommand="contentChanged=true;">
|
||||
<menupopup>
|
||||
<menuitem value="&toAddr.label;"/>
|
||||
<menuitem value="&ccAddr.label;"/>
|
||||
@ -54,32 +54,15 @@ Rights Reserved.
|
||||
<menuitem value="&newsgroupsAddr.label;"/>
|
||||
<menuitem value="&followupAddr.label;"/>
|
||||
</menupopup>
|
||||
</menulist-->
|
||||
<html:select id="msgRecipientType#1"
|
||||
onclick="awNotAnEmptyArea(event)"
|
||||
onchange="contentChanged=true;">
|
||||
<html:option value="addr_to">&toAddr.label;</html:option>
|
||||
<html:option value="addr_cc">&ccAddr.label;</html:option>
|
||||
<html:option value="addr_bcc">&bccAddr.label;</html:option>
|
||||
<html:option value="addr_reply">&replyAddr.label;</html:option>
|
||||
<html:option value="addr_newsgroups">&newsgroupsAddr.label;</html:option>
|
||||
<html:option value="addr_followup">&followupAddr.label;</html:option>
|
||||
</html:select>
|
||||
</menulist>
|
||||
|
||||
<image onclick="awNotAnEmptyArea(event)"/>
|
||||
|
||||
<!--html:input id="msgRecipient#1"
|
||||
flex="100%"
|
||||
class="addressingWidget"
|
||||
type="text"
|
||||
onkeyup="if (event.which == 13)
|
||||
{ AutoCompleteAddress(this); awReturnHit(this); }"
|
||||
onkeydown="if (event.which == 9) awTabFromRecipient(this, event);"
|
||||
onchange="contentChanged=true; awInputChanged(this);"
|
||||
onclick="awNotAnEmptyArea(event);"
|
||||
/-->
|
||||
<autocomplete id="msgRecipient#1"
|
||||
<box autostretch="never">
|
||||
<image onclick="awNotAnEmptyArea(event)"/>
|
||||
</box>
|
||||
|
||||
<textfield id="msgRecipient#1"
|
||||
flex="100%"
|
||||
autocomplete="true"
|
||||
class="addressingWidget"
|
||||
style="width:0px"
|
||||
onkeyup="if (event.which == 13) awReturnHit(this);"
|
||||
|
@ -173,8 +173,6 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
|
||||
|
||||
<menuitem value="&attachFileCmd.label;" accesskey="&attachFileCmd.accesskey;" observes="cmd_attachFile"/>
|
||||
<menuitem value="&attachPageCmd.label;" accesskey="&attachPageCmd.accesskey;" oncommand="AttachPage()"/>
|
||||
<!-- the next menu item is TEMPORARY until we figure how to hook up the deleted key in the attachment tree -->
|
||||
<menuitem value="&removeLastAttachmentCmd.label;" oncommand="RemoveSelectedAttachment()"/>
|
||||
<menuseparator/>
|
||||
|
||||
<menuitem value="&sendNowCmd.label;" accessKey="&sendNowCmd.accesskey;" observes="cmd_sendNow"/>
|
||||
@ -398,10 +396,10 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
|
||||
<box align="vertical" flex="75%">
|
||||
<spring style="height:0.5em"/>
|
||||
<box align="horizontal">
|
||||
<text value="&fromAddr.label;" />
|
||||
<text value="&fromAddr.label;"/>
|
||||
<spring style="width:0.5em"/>
|
||||
<menulist id="msgIdentity" value="..." oncommand="contentChanged=true; LoadIdentity(false);">
|
||||
<menupopup id="msgIdentityPopup" />
|
||||
<menulist id="msgIdentity" value="..." flex="100%" oncommand="contentChanged=true; LoadIdentity(false);">
|
||||
<menupopup id="msgIdentityPopup" flex="100%"/>
|
||||
</menulist>
|
||||
</box>
|
||||
<spring style="height:0.5em"/>
|
||||
@ -411,9 +409,9 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
|
||||
<spring style="height:0.5em"/>
|
||||
|
||||
<box align="horizontal">
|
||||
<html:div>&subject.label;</html:div>
|
||||
<text value="&subject.label;"/>
|
||||
<spring style="width:0.5em"/>
|
||||
<html:input id="msgSubject" type="text" flex="100%"
|
||||
<textfield id="msgSubject" type="text" flex="100%"
|
||||
onkeyup="SetComposeWindowTitle(event.which);
|
||||
if (event.which == 13)
|
||||
contentWindow.focus();"
|
||||
@ -432,12 +430,12 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
|
||||
<box align="vertical" flex="25%">
|
||||
<spring style="height:0.5em"/>
|
||||
<box align="vertical" style="height:1em">
|
||||
<html:div flex="100%">&attachments.label;</html:div>
|
||||
<text value="&attachments.label;" flex="100%"/>
|
||||
</box>
|
||||
<spring style="height:0.5em"/>
|
||||
<box align="vertical" style="height:8.5em; background-color:white; border-top:solid black 1px">
|
||||
<tree id="attachmentBucket" flex="100%" style="width:0px"
|
||||
onkeypress="if (event.which == 8) RemoveSelectedAttachment();"
|
||||
onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveSelectedAttachment();"
|
||||
onchange="contentChanged=true;">
|
||||
<treecol style="width:100%"/>
|
||||
|
||||
|
@ -25,7 +25,6 @@
|
||||
<!ENTITY attachFileCmd.accesskey "F">
|
||||
<!ENTITY attachPageCmd.label "Attach Web Page...">
|
||||
<!ENTITY attachPageCmd.accesskey "W">
|
||||
<!ENTITY removeLastAttachmentCmd.label "Remove Selected Attachment">
|
||||
<!ENTITY sendNowCmd.label "Send">
|
||||
<!ENTITY sendNowCmd.keycode "VK_ENTER">
|
||||
<!ENTITY sendNowCmd.accesskey "d">
|
||||
|
@ -35,34 +35,58 @@ tree[class="attachment"] treeitem > treerow > treecell > titledbutton {
|
||||
|
||||
/* addressing widget */
|
||||
|
||||
tree[class="addressingWidget"] treeitem > treerow > treecell > image {
|
||||
tree[class="addressingWidget"] treeitem > treerow > treecell > box > image {
|
||||
vertical-align: middle;
|
||||
min-height: 1px;
|
||||
min-width: 1px;
|
||||
height: 1em;
|
||||
width: 2em;
|
||||
margin:0px;
|
||||
padding:0px;
|
||||
padding:2px;
|
||||
border:none;
|
||||
list-style-image: url("chrome://messenger/skin/addressbook/person.gif");
|
||||
user-focus: ignore;
|
||||
}
|
||||
|
||||
autocomplete[class="addressingWidget"] {
|
||||
border : 2px solid #FFFFFF;
|
||||
font : inherit;
|
||||
color : #000000;
|
||||
padding : 0px;
|
||||
margin : 1px 3px 2px 4px;
|
||||
background-color : #FFFFFF;
|
||||
-moz-border-radius : 3px 2px 2px 3px;
|
||||
cursor : text;
|
||||
/*
|
||||
menulist.outset
|
||||
{
|
||||
padding : 0px;
|
||||
border : 1px solid #000000;
|
||||
background-color : #CCCCCC;
|
||||
-moz-border-radius : 3px 2px 2px 3px;
|
||||
margin : 1px;
|
||||
}
|
||||
|
||||
autocomplete[class="addressingWidget"][focused="true"]
|
||||
menulist.outset > menupopup > menuitem
|
||||
{
|
||||
max-width: auto;
|
||||
min-width: 32px;
|
||||
}
|
||||
|
||||
menulist.outset > .menu-text
|
||||
{
|
||||
border : 1px outset #CCCCCC;;
|
||||
padding : 1px 4px 2px 4px;
|
||||
margin-right : 0px;
|
||||
}
|
||||
|
||||
menulist.outset[open="true"] > .menu-text
|
||||
{
|
||||
border : 1px inset #CCCCCC;;
|
||||
padding : 2px 4px 1px 4px;
|
||||
}
|
||||
*/
|
||||
|
||||
textfield.addressingWidget[autocomplete="true"] {
|
||||
border : 2px solid #FFFFFF;
|
||||
margin : 1px;
|
||||
}
|
||||
|
||||
textfield.addressingWidget[autocomplete="true"][focused="true"]
|
||||
{
|
||||
border : 2px solid #6699cc;
|
||||
margin : 0px 2px 1px 3px;
|
||||
margin : 1px;
|
||||
}
|
||||
|
||||
textfield.addressingWidget[autocomplete="true"] > box
|
||||
{
|
||||
border : none;
|
||||
}
|
||||
|
||||
#button_send {
|
||||
|
Loading…
Reference in New Issue
Block a user