Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Roll back this weekend's changes to editor dialogs, pending grid fixes.

Browse Source
This commit is contained in:
ben%netscape.com 2001-08-07 01:53:44 +00:00
parent c724cca941
commit 1590d377a4
6 changed files with 59 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/ui/dialogs/content/EdColorProps.xul
View File

@ -133,19 +133,23 @@
</groupbox>
<spring class="spacer"/>
<text class="label" value="&backgroundImage.label;"/>
<hbox>
<textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage()"
tooltip="aTooltip" tooltiptext="&backgroundImage.tooltip;"
style="min-width : 21em"/>
<!-- from EdDialogOverlay.xul -->
<button class="dialog" id="ChooseFile"/>
</hbox>
<separator/>
<hbox>
<button class="dialog" id="AdvancedEditButton"/>
<spring flex="1"/>
<!-- from EdDialogOverlay.xul -->
<hbox id="okCancelButtonsRight"/>
</hbox>
<grid flex="1">
<columns><column flex="10"/><column flex="1"/></columns>
<rows>
<row autostretch="never" valign="middle" style="margin-bottom: 5px">
<textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage()"
tooltip="aTooltip" tooltiptext="&backgroundImage.tooltip;"
style="min-width : 21em"/>
<!-- from EdDialogOverlay.xul -->
<button class="dialog" id="ChooseFile"/>
</row>
<row autostretch="never" valign="middle">
<spring flex="1"/>
<!-- from EdDialogOverlay.xul -->
<button class="dialog" id="AdvancedEditButton"/>
</row>
</rows>
</grid>
<separator class="groove"/>
<hbox id="okCancelButtons"/>
</window>

14
editor/ui/dialogs/content/EdImageProps.js
View File

@ -91,7 +91,6 @@ function Startup()
dialog.PreviewWidth = document.getElementById( "PreviewWidth" );
dialog.PreviewHeight = document.getElementById( "PreviewHeight" );
dialog.PreviewSize = document.getElementById( "PreviewSize" );
dialog.PreviewImageData = document.getElementById( "PreviewImageData" );
// Get a single selected image element
var tagName = "img"
@ -284,6 +283,7 @@ function PreviewImageLoaded()
dialog.PreviewWidth.setAttribute("value", actualWidth);
dialog.PreviewHeight.setAttribute("value", actualHeight);
dialog.PreviewSize.setAttribute("collapsed", "false");
dialog.ImageHolder.setAttribute("collapsed", "false");
// Use values as start for constrain proportions
@ -296,9 +296,8 @@ function PreviewImageLoaded()
function GetImageFromURL()
{
dialog.PreviewWidth.setAttribute("value", dialog.PreviewImageData.getAttribute("value"));
dialog.PreviewHeight.setAttribute("value", dialog.PreviewImageData.getAttribute("value"));
dialog.PreviewSize.setAttribute("collapsed", "true");
var imageSrc = dialog.srcInput.value;
if (imageSrc) imageSrc = imageSrc.trimString();
if (!imageSrc) return;
@ -362,6 +361,9 @@ function onMoreFewer()
dialog.MoreFewerButton.setAttribute("label", GetString("MoreProperties"));
dialog.MoreFewerButton.setAttribute("more","0");
SeeMore = false;
// Show the "Advanced Edit" button on same line as "More Properties"
dialog.AdvancedEditButton.setAttribute("collapsed","false");
dialog.AdvancedEditButton2.setAttribute("collapsed","true");
// Weird caret appearing when we collapse, so force focus to URL textbox
dialog.srcInput.focus();
}
@ -371,6 +373,10 @@ function onMoreFewer()
dialog.MoreFewerButton.setAttribute("label", GetString("FewerProperties"));
dialog.MoreFewerButton.setAttribute("more","1");
SeeMore = true;
// Show the "Advanced Edit" button at bottom
dialog.AdvancedEditButton.setAttribute("collapsed","true");
dialog.AdvancedEditButton2.setAttribute("collapsed","false");
}
window.sizeToContent();
}

57
editor/ui/dialogs/content/EdImageProps.xul
View File

@ -40,7 +40,6 @@
xmlns:html="http://www.w3.org/1999/xhtml"
onload = "Startup()"
orient="vertical"
style="width: 43em;"
id="imagedialog"
>
@ -59,11 +58,7 @@
<label value="&locationBox.label;"/>
<!--/////// Src URL and ALT Text //////-->
<grid>
<columns>
<column/>
<column flex="2"/>
<column flex="1"/>
</columns>
<columns><column/><column/><column flex="1"/></columns>
<rows>
<row align="center">
<text class = "label"
@ -95,41 +90,38 @@
</groupbox>
<spring class="spacer"/>
<hbox align="center">
<vbox pack="end">
<!-- From EdDialogOverlay.xul -->
<button id="AdvancedEditButton"/>
<button
class = "dialog"
id = "MoreFewerButton"
oncommand = "onMoreFewer()"
tooltip = "aTooltip" tooltiptext = "&MoreFewerButton.tooltip;"
persist = "more"/>
</vbox>
<button
class = "dialog"
id = "MoreFewerButton"
oncommand = "onMoreFewer()"
tooltip = "aTooltip" tooltiptext = "&MoreFewerButton.tooltip;"
persist = "more"/>
<spring class="spacer"/>
<groupbox style="padding: 4px" flex="1">
<label value="&previewBox.label;"/>
<groupbox style="padding: 4px">
<hbox id="preview-image-box" align="center">
<spring flex="1"/>
<html id="preview-image-holder"/>
<spring flex="1"/>
</hbox>
<vbox id="PreviewSize">
<vbox id="PreviewSize" collapsed="true">
<spring flex="1"/>
<text class="label" value="&actualSize.label;"/>
<data id="PreviewImageData" value="&noImageSelected.label;"/>
<hbox>
<text class="label" value="&widthEditField.label;"/>
<spring flex="1"/>
<text id="PreviewWidth" class="label" value="&noImageSelected.label;"/>
<text id="PreviewWidth" class="label"/>
</hbox>
<hbox>
<text class="label" value="&heightEditField.label;"/>
<spring flex="1"/>
<text id="PreviewHeight" class="label" value="&noImageSelected.label;"/>
<text id="PreviewHeight" class="label"/>
</hbox>
<spring flex="1"/>
</vbox>
</groupbox>
<spring flex="1"/>
<!-- From EdDialogOverlay.xul -->
<button id="AdvancedEditButton"/>
</hbox>
<spring class="spacer"/>
<!-- Area that shows and hides via MoreFewerButton -->
@ -166,11 +158,7 @@
</hbox>
<spring class="spacer"/>
<grid class="big-left-margin">
<columns>
<column flex="1"/>
<column flex="1"/>
<column flex="3"/>
</columns>
<columns><column/><column/><column flex="1"/></columns>
<rows>
<!--////// IMAGE WIDTH //////-->
<row align="center">
@ -254,11 +242,7 @@
<groupbox flex="1">
<label id="spacingLabel" value="&spacingBox.label;"/>
<grid>
<columns>
<column flex="1"/>
<column flex="1"/>
<column flex="4"/>
</columns>
<columns><column/><column/><column/></columns>
<rows>
<row align="center">
<text
@ -306,7 +290,16 @@
</groupbox>
</vbox> <!-- Bottom Right region -->
</hbox> <!-- The horizontal box -->
<!-- buttons along bottom -->
<spring class="spacer"/>
<hbox>
<spring flex="1"/>
<!-- From EdDialogOverlay -->
<button id="AdvancedEditButton2"/>
</hbox>
</vbox> <!-- END OF MORE/FEWER SECTION -->
<separator class="groove"/>
<!-- from global dialogOverlay -->
<hbox id="okCancelHelpButtonsRight"/>
</window>

11
editor/ui/dialogs/content/EdInsertTable.xul
View File

@ -37,7 +37,6 @@
xmlns:html="http://www.w3.org/1999/xhtml"
onload = "Startup()"
persist="screenX screenY"
style="width: 25em;"
orient="vertical">
<!-- Methods common to all editor dialogs -->
@ -51,11 +50,7 @@
<popupset id="aTooltipSet" />
<groupbox orient="vertical"><label value="&size.label;"/>
<grid>
<columns>
<column flex="1"/>
<column flex="1"/>
<column flex="6"/>
</columns>
<columns><column/><column/><column/></columns>
<rows>
<row valign="middle" text-align="right" autostretch="never">
<text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
@ -87,7 +82,5 @@
<!-- from EdDialogOverlay -->
<vbox id="AdvancedEdit"/>
<!-- from global dialogOverlay -->
<hbox id="okCancelButtonsRight"/>
<hbox id="okCancelButtons"/>
</window>

17
editor/ui/dialogs/content/EdTableProps.xul
View File

@ -84,11 +84,7 @@
</groupbox>
<groupbox orient="vertical"><label align="left" value="&tableBorderSpacing.label;"/>
<grid>
<columns>
<column flex="1"/>
<column flex="1"/>
<column flex="9"/>
</columns>
<columns><column/><column/><column/></columns>
<rows>
<row valign="middle">
<text class="label" value="&tableBorderWidth.label;"/>
@ -179,11 +175,7 @@
<!-- cell size groupbox -->
<groupbox><label align="left" value="&size.label;"/>
<grid>
<columns>
<column flex="3"/>
<column flex="2"/>
<column flex="4"/>
</columns>
<columns><column/><column/><column flex="1"/></columns>
<rows>
<row valign="middle" autostretch="never">
<checkbox id="CellHeightCheckbox" label="&tableHeight.label;"/>
@ -204,10 +196,7 @@
<!-- Alignment -->
<groupbox><label value="&cellContentAlignment.label;"/>
<grid>
<columns>
<column flex="4"/>
<column flex="5"/>
</columns>
<columns><column/><column flex="1"/><column/></columns>
<rows>
<row valign="middle" autostretch="never">
<checkbox id="CellVAlignCheckbox" label="&cellVertical.label;"/>

3
editor/ui/dialogs/locale/en-US/EditorImageProperties.dtd
View File

@ -35,9 +35,6 @@
<!ENTITY altTextEditField.label "Alternative Text:">
<!ENTITY altTextEditField.tooltip "Type text to display in place of the image">
<!ENTITY previewBox.label "Preview">
<!ENTITY noImageSelected.label "&lt;No image chosen&gt;">
<!ENTITY MoreFewerButton.tooltip "Display more or fewer properties to edit">
<!-- These controls are in the Dimensions box of the expanded area -->
<!ENTITY dimensionsBox.label "Dimensions">