зеркало из https://github.com/mozilla/pjs.git
Fixed bugs 20694 (Colorpicker crash in UNIX, Mac), 22064 (text wrap for insert image), 22176 (Insert table menu item)
This commit is contained in:
cmanske%netscape.com
Родитель
17ab170ce8
Коммит
d7ac7788d8
|
|
@ -114,59 +114,57 @@
|
|||
</menubar>
|
||||
|
||||
<toolbox>
|
||||
<!-- toolbar filled out from editorOverlay -->
|
||||
<!-- add class="standard" for dark blue background (icons need rework first) -->
|
||||
<toolbar id="EditToolbar" class="standard" persist="collapsed">
|
||||
<!-- box id="toolbar_button_box" -->
|
||||
<titledbutton id="newButton"/>
|
||||
<titledbutton id="openButton"/>
|
||||
<titledbutton id="saveButton"/>
|
||||
<toolbarseparator/>
|
||||
<titledbutton id="printButton"/>
|
||||
<titledbutton id="findButton"/>
|
||||
<titledbutton id="spellingButton"/>
|
||||
<toolbarseparator/>
|
||||
<titledbutton id="imageButton"/>
|
||||
<titledbutton id="hlineButton"/>
|
||||
<titledbutton id="tableButton"/>
|
||||
<titledbutton id="linkButton"/>
|
||||
<titledbutton id="namedAnchorButton"/>
|
||||
<spring flex="100%"/>
|
||||
<!-- toolbar filled out from editorOverlay -->
|
||||
<!-- add class="standard" for dark blue background (icons need rework first) -->
|
||||
<toolbar id="EditToolbar" class="standard" persist="collapsed">
|
||||
<titledbutton id="newButton"/>
|
||||
<titledbutton id="openButton"/>
|
||||
<titledbutton id="saveButton"/>
|
||||
<toolbarseparator/>
|
||||
<titledbutton id="printButton"/>
|
||||
<titledbutton id="findButton"/>
|
||||
<titledbutton id="spellingButton"/>
|
||||
<toolbarseparator/>
|
||||
<titledbutton id="imageButton"/>
|
||||
<titledbutton id="hlineButton"/>
|
||||
<titledbutton id="tableButton"/>
|
||||
<titledbutton id="linkButton"/>
|
||||
<titledbutton id="namedAnchorButton"/>
|
||||
<spring flex="100%"/>
|
||||
|
||||
<box id="toolbar_throbber_box" align="vertical">
|
||||
<titledbutton id="Throbber" onclick="window.open('http://www.mozilla.org/editor');">
|
||||
<observes element="Editor:Throbber" attribute="busy"/>
|
||||
</titledbutton>
|
||||
</box>
|
||||
<box id="toolbar_throbber_box" align="vertical">
|
||||
<titledbutton id="Throbber" onclick="window.open('http://www.mozilla.org/editor');">
|
||||
<observes element="Editor:Throbber" attribute="busy"/>
|
||||
</titledbutton>
|
||||
</box>
|
||||
</toolbar>
|
||||
|
||||
</toolbar>
|
||||
<toolbar id="FormatToolbar" persist="collapsed">
|
||||
<html:div>
|
||||
<!-- items are filled out from editorOverlay -->
|
||||
<html:select id="ParagraphSelect"/>
|
||||
<html:select id="FontFaceSelect"/>
|
||||
</html:div>
|
||||
|
||||
<toolbar id="FormatToolbar" persist="collapsed">
|
||||
<html:div>
|
||||
<!-- items are filled out from editorOverlay -->
|
||||
<html:select id="ParagraphSelect"/>
|
||||
<html:select id="FontFaceSelect"/>
|
||||
</html:div>
|
||||
<html:div id="ColorButtons"/>
|
||||
|
||||
<html:div id="ColorButtons"/>
|
||||
<titledbutton id="DecreaseFontSizeButton"/>
|
||||
<titledbutton id="IncreaseFontSizeButton"/>
|
||||
<titledbutton id="boldButton"/>
|
||||
<titledbutton id="italicButton"/>
|
||||
<titledbutton id="underlineButton"/>
|
||||
<titledbutton id="ulButton"/>
|
||||
<titledbutton id="olButton"/>
|
||||
<titledbutton id="outdentButton"/>
|
||||
<titledbutton id="indentButton"/>
|
||||
|
||||
<titledbutton id="DecreaseFontSizeButton"/>
|
||||
<titledbutton id="IncreaseFontSizeButton"/>
|
||||
<titledbutton id="boldButton"/>
|
||||
<titledbutton id="italicButton"/>
|
||||
<titledbutton id="underlineButton"/>
|
||||
<titledbutton id="ulButton"/>
|
||||
<titledbutton id="olButton"/>
|
||||
<titledbutton id="outdentButton"/>
|
||||
<titledbutton id="indentButton"/>
|
||||
|
||||
<menu>
|
||||
<titledbutton id="AlignPopupButton"/>
|
||||
<menupopup id="AlignmentPopup"/>
|
||||
</menu>
|
||||
<spring flex="100%"/>
|
||||
</toolbar>
|
||||
</toolbox>
|
||||
<menu>
|
||||
<titledbutton id="AlignPopupButton"/>
|
||||
<menupopup id="AlignmentPopup"/>
|
||||
</menu>
|
||||
<spring flex="100%"/>
|
||||
</toolbar>
|
||||
</toolbox>
|
||||
|
||||
<!-- sidebar/toolbar/content/status -->
|
||||
<box id="sidebar-parent" align="horizontal" flex="100%">
|
||||
|
|
|
|||
|
|
@ -547,7 +547,7 @@
|
|||
</menu>
|
||||
<menu id="tableInsertMenu" value="&tableInsertMenu.label;" accesskey="&tableinsertmenu.accesskey;">
|
||||
<menupopup>
|
||||
<menuitem value="&tableTable.label;" accesskey="&tabletable.accesskey;" oncommand="EditorInsertTable()"/>
|
||||
<menuitem value="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" oncommand="EditorInsertTable()"/>
|
||||
<menuseparator />
|
||||
<menuitem value="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" oncommand="EditorInsertTableRow(false)"/>
|
||||
<menuitem value="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" oncommand="EditorInsertTableRow(true)"/>
|
||||
|
|
@ -576,14 +576,14 @@
|
|||
<popup id="TextColorPicker" popupanchor="bottomleft">
|
||||
<html:div id="TextColorCaption" class="color-caption" align="center">&textColorCaption.label;</html:div>
|
||||
<!-- TODO: Add "Last color picked" button and text -->
|
||||
<colorpicker palettename="standard" onclick="EditorSelectTextColor(); window.close()"/>
|
||||
<colorpicker palettename="standard" onclick="EditorSelectTextColor();"/>
|
||||
</popup>
|
||||
|
||||
<popup id="BackColorPicker" popupanchor="bottomleft">
|
||||
<!-- Text Caption is filled in at runtime -->
|
||||
<!-- TODO: Add "Last color picked" button and text -->
|
||||
<html:div id="BackColorCaption" class="color-caption" align="center">Background Color</html:div>
|
||||
<colorpicker palettename="standard" onclick="EditorSelectBackColor() window.close()"/>
|
||||
<colorpicker palettename="standard" onclick="EditorSelectBackColor()"/>
|
||||
</popup>
|
||||
|
||||
<menupopup id="AlignmentPopup">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче