Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed xul to use new treecolgroup in Composer main window b=30511 (by bryner, r=cmanske). Removed textfield in colorpicker - doesn't work, crashes in Linux b=41619, r=akkana

Browse Source
This commit is contained in:
cmanske%netscape.com 2000-06-22 01:13:28 +00:00
parent dfe84bc851
commit 26de5cacec
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/ui/composer/content/editorOverlay.xul
View File

@ -604,7 +604,6 @@
<colorpicker id="TextColorPicker" palettename="standard" onclick="EditorSelectTextColor('TextColorPicker','TextColorPopupButton');"/> <colorpicker id="TextColorPicker" palettename="standard" onclick="EditorSelectTextColor('TextColorPicker','TextColorPopupButton');"/>
<box valign="middle" autostretch="never"> <box valign="middle" autostretch="never">
<text class="label" value="&colorLabel.label;"/> <text class="label" value="&colorLabel.label;"/>
<textfield id="TextColorInput" flex="1" style="width: 1em"/>
<button class="dialog" value="&ok.label;" oncommand="SetManualTextColor()"/> <button class="dialog" value="&ok.label;" oncommand="SetManualTextColor()"/>
</box> </box>
<button class="dialog" value="&colorPicker.default.label;" oncommand="EditorRemoveTextColor('TextColorPopupButton');"/> <button class="dialog" value="&colorPicker.default.label;" oncommand="EditorRemoveTextColor('TextColorPopupButton');"/>
@ -621,7 +620,6 @@
<colorpicker id="BackColorPicker" palettename="standard" onclick="EditorSelectBackColor('BackColorPicker','BackColorPopupButton');"/> <colorpicker id="BackColorPicker" palettename="standard" onclick="EditorSelectBackColor('BackColorPicker','BackColorPopupButton');"/>
<box valign="middle" autostretch="never"> <box valign="middle" autostretch="never">
<text class="label" value="&colorLabel.label;"/> <text class="label" value="&colorLabel.label;"/>
<textfield id="BackColorInput" flex="1" style="width: 1em"/>
<button class="dialog" value="Ok" oncommand="SetManualBackColor()"/> <button class="dialog" value="Ok" oncommand="SetManualBackColor()"/>
</box> </box>
<button class="dialog" value="&colorPicker.default.label;" oncommand="EditorRemoveBackColor('BackColorPopupButton');"/> <button class="dialog" value="&colorPicker.default.label;" oncommand="EditorRemoveBackColor('BackColorPopupButton');"/>

8
editor/ui/composer/content/sb-bookmarks-panel.xul
View File

@ -45,7 +45,7 @@
<!-- Commented out until new tree content model and template builder can play nice --> <!-- Commented out until new tree content model and template builder can play nice -->
<template> <template>
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator"> <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
<treechildren> <treechildren flex="1">
<treeitem uri="..."> <treeitem uri="...">
<treerow> <treerow>
<treecell> <treecell>
@ -57,7 +57,7 @@
</rule> </rule>
<rule> <rule>
<treechildren> <treechildren flex="1">
<treeitem uri="..."> <treeitem uri="...">
<treerow> <treerow>
<treecell> <treecell>
@ -70,7 +70,9 @@
</treechildren> </treechildren>
</rule> </rule>
</template> </template>
<treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/> <treecolgroup>
<treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
</treecolgroup>
</tree> </tree>
</window> </window>

7
editor/ui/composer/content/sb-file-panel.xul
View File

@ -47,7 +47,7 @@
<!-- Commented out until new tree content model and template builder can play nice --> <!-- Commented out until new tree content model and template builder can play nice -->
<template> <template>
<rule> <rule>
<treechildren> <treechildren flex="1">
<treeitem uri="..."> <treeitem uri="...">
<treerow> <treerow>
<treecell> <treecell>
@ -60,7 +60,10 @@
</treechildren> </treechildren>
</rule> </rule>
</template> </template>
<treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
<treecolgroup>
<treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
</treecolgroup>
</tree> </tree>
</window> </window>