mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-07 09:13:12 +00:00
Fix to editor pref dialog layout bug 77517, r=blake, sr=ben
This commit is contained in:
parent
2977d213eb
commit
d494092ba4
@ -45,102 +45,98 @@
|
||||
|
||||
<box class="box-smallheader" title="&lHeader;"/>
|
||||
|
||||
<titledbox orient="vertical">
|
||||
<label value="&authorName.label;"/>
|
||||
<textbox id="editorAuthor" flex="1"
|
||||
pref="true" preftype="string" prefstring="editor.author"
|
||||
prefattribute="value"/>
|
||||
</titledbox>
|
||||
|
||||
<titledbox orient="vertical">
|
||||
<vbox>
|
||||
<text class="label small-margin" value="&authorName.label;"/>
|
||||
<box>
|
||||
<textbox id="editorAuthor" flex="1"
|
||||
pref="true" preftype="string" prefstring="editor.author"
|
||||
prefattribute="value"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</box>
|
||||
<titledbox orient="vertical" autostretch="never">
|
||||
<label value="&pageColorHeader;"/>
|
||||
<box orient="horizontal">
|
||||
<box orient="vertical">
|
||||
<radiogroup id="useCustomColors" orient="vertical" autostretch="never"
|
||||
pref="true" preftype="bool" prefstring="editor.use_custom_colors"
|
||||
prefattribute="value">
|
||||
<radio group="useCustomColors" id="DefaultColorsRadio"
|
||||
value="false"
|
||||
label="&defaultColorsRadio.label;"
|
||||
accesskey="&defaultColors.accesskey;"
|
||||
oncommand="UseDefaultColors();"/>
|
||||
<text class="label" value="&defaultColorsMsg.label;" style="margin-left: 26px"/>
|
||||
<radio group="useCustomColors" id="CustomColorsRadio"
|
||||
value="true" label="&customColorsRadio.label;"
|
||||
accesskey="&customColors.accesskey;"
|
||||
oncommand="UseCustomColors()"/>
|
||||
</radiogroup>
|
||||
<spring class="bigspacer"/>
|
||||
<box class="big-left-margin">
|
||||
<grid>
|
||||
<columns><column/><column/></columns>
|
||||
<rows>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Text" value="&normalText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="textCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="textData" pref="true" preftype="color" prefstring="editor.text_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Link" value="&linkText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="linkCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="linkData" pref="true" preftype="color" prefstring="editor.link_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="activeCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="aLinkData" pref="true" preftype="color" prefstring="editor.active_link_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="visitedCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
<data id="fLinkData" pref="true" preftype="color" prefstring="editor.followed_link_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</stack>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Background" value="&background.label;" />
|
||||
<stack>
|
||||
<button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="backgroundCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="backgroundColorData" pref="true" preftype="color" prefstring="editor.background_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</box>
|
||||
<box orient="vertical" id="ColorPreview" flex="1">
|
||||
<radiogroup id="useCustomColors" orient="vertical" autostretch="never"
|
||||
pref="true" preftype="bool" prefstring="editor.use_custom_colors"
|
||||
prefattribute="value">
|
||||
<radio class="small-margin" group="useCustomColors" id="DefaultColorsRadio"
|
||||
value="false"
|
||||
label="&defaultColorsRadio.label;"
|
||||
accesskey="&defaultColors.accesskey;"
|
||||
oncommand="UseDefaultColors();"/>
|
||||
<radio class="small-margin" group="useCustomColors" id="CustomColorsRadio"
|
||||
value="true" label="&customColorsRadio.label;"
|
||||
accesskey="&customColors.accesskey;"
|
||||
oncommand="UseCustomColors()"/>
|
||||
</radiogroup>
|
||||
|
||||
<box class="big-left-margin">
|
||||
<grid>
|
||||
<columns><column/><column/></columns>
|
||||
<rows>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Text" value="&normalText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="textCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="textData" pref="true" preftype="color" prefstring="editor.text_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Link" value="&linkText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="linkCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="linkData" pref="true" preftype="color" prefstring="editor.link_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="activeCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="aLinkData" pref="true" preftype="color" prefstring="editor.active_link_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
|
||||
<stack>
|
||||
<button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="visitedCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
<data id="fLinkData" pref="true" preftype="color" prefstring="editor.followed_link_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</stack>
|
||||
</row>
|
||||
<row valign="middle" autostretch="never">
|
||||
<text class="label" id="Background" value="&background.label;" />
|
||||
<stack>
|
||||
<button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
|
||||
<box autostretch="never" valign="middle" mousethrough="always">
|
||||
<spring flex="1"/>
|
||||
<spring id="backgroundCW" class="color-well"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</stack>
|
||||
<data id="backgroundColorData" pref="true" preftype="color" prefstring="editor.background_color" prefattribute="value" wsm_attributes="value"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<vbox id="ColorPreview" flex="1">
|
||||
<spring flex="1"/>
|
||||
<text class="label larger" id="NormalText" value="&normalText.label;"/>
|
||||
<spring flex="1"/>
|
||||
@ -151,11 +147,10 @@
|
||||
<text class="label larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
<spring class="spacer"/>
|
||||
<separator class="thin"/>
|
||||
|
||||
<text class="label" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
|
||||
<spring class="spacer"/>
|
||||
<text class="label small-margin" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
|
||||
<box valign="middle" autostretch="never">
|
||||
<textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width : 16em">
|
||||
<observes element="backgroundImageData" attribute="disabled"/>
|
||||
|
@ -1,13 +1,12 @@
|
||||
<!ENTITY lHeader "New Page Settings">
|
||||
<!ENTITY rHeader "Defaults for new pages">
|
||||
|
||||
<!ENTITY authorName.label "Author">
|
||||
<!ENTITY authorName.label "Author:">
|
||||
<!ENTITY authorName.accesskey "a">
|
||||
<!ENTITY pageColorHeader "Default Page Appearance">
|
||||
|
||||
<!ENTITY defaultColorsRadio.label "Reader's default colors">
|
||||
<!ENTITY defaultColorsRadio.label "Reader's default colors (Don't set colors in page)">
|
||||
<!ENTITY defaultColors.accesskey "d">
|
||||
<!ENTITY defaultColorsMsg.label "(Don't set colors in page)">
|
||||
<!ENTITY customColorsRadio.label "Use custom colors:">
|
||||
<!ENTITY customColors.accesskey "c">
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user