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

Bug 89998 - deprecate titledbox in favor of groupbox. This checkin moves the groupbox functionality to groupbox.* instead of titledbox.*. Patch from andersma@luther.edu, r=bryner, sr=hewitt.

Browse Source
This commit is contained in:
bryner%netscape.com 2001-09-15 06:47:08 +00:00
parent fed55711ff
commit bc427652a4
13 changed files with 19 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
themes/classic/global/mac/groupbox.css
View File

@ -1,6 +1,3 @@
/* titledbox is deprecated but included for backwards compatibility;
it is to be removed later */
titledbox,
groupbox
{
border : 2px groove #CCCCCC;
@ -8,15 +5,6 @@ groupbox
margin : 5px;
}
groupbox > label
{
margin-left : 6px;
padding-left : 3px;
padding-right : 3px;
background-color : #DEDEDE;
}
box.groupbox-title
{
padding-left : 5px;

2
themes/classic/global/mac/jar.mn
View File

@ -9,6 +9,7 @@ classic.jar:
skin/classic/global/filepicker.css
skin/classic/global/formatting.css
skin/classic/global/global.css
skin/classic/global/groupbox.css
skin/classic/global/menu.css
skin/classic/global/menubutton.css
skin/classic/global/menulist.css
@ -19,7 +20,6 @@ classic.jar:
skin/classic/global/scrollbox.css
skin/classic/global/splitter.css
skin/classic/global/tabbox.css
skin/classic/global/titledbox.css
skin/classic/global/textbox.css
skin/classic/global/toolbar.css
skin/classic/global/tree.css

17
themes/classic/global/mac/titledbox.css
View File

@ -1,17 +0,0 @@
groupbox
{
border : 2px groove #CCCCCC;
padding : 7px;
margin : 5px;
}
box.groupbox-title
{
padding-left : 5px;
padding-right : 5px;
}
box.groupbox-body
{
padding : inherit;
}

10
themes/classic/global/win/groupbox.css
View File

@ -1,6 +1,3 @@
/* titledbox is deprecated but included for backwards compatibility;
it is to be removed later */
titledbox,
groupbox
{
border : 2px groove -moz-Dialog;
@ -8,13 +5,6 @@ groupbox
margin : 5px;
}
groupbox > label
{
margin : 0px 40px 2px 6px;
padding : 0px 3px 0px 3px;
background-color : -moz-Dialog;
}
.groupbox-body
{
padding : inherit;

2
themes/classic/global/win/jar.mn
View File

@ -10,6 +10,7 @@ classic.jar:
skin/classic/global/filepicker.css
skin/classic/global/formatting.css
skin/classic/global/global.css
skin/classic/global/groupbox.css
skin/classic/global/menu.css
skin/classic/global/menubutton.css
skin/classic/global/menulist.css
@ -22,7 +23,6 @@ classic.jar:
skin/classic/global/splitter.css
skin/classic/global/tabbox.css
skin/classic/global/textbox.css
skin/classic/global/titledbox.css
skin/classic/global/toolbar.css
skin/classic/global/tree.css
skin/classic/global/outliner.css

11
themes/classic/global/win/titledbox.css
View File

@ -1,11 +0,0 @@
groupbox
{
border : 2px groove -moz-Dialog;
padding : 7px !important;
margin : 5px;
}
.groupbox-body
{
padding : inherit;
}

2
themes/modern/global/groupbox.css
View File

@ -21,7 +21,7 @@
*
*/
/* ===== titledbox.css ==================================================
/* ===== groupbox.css ==================================================
== Styles used by the XUL groupbox and related elements.
======================================================================= */

40
themes/modern/global/titledbox.css
View File

@ -1,40 +0,0 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== titledbox.css ==================================================
== Styles used by the XUL groupbox and related elements.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: groupbox ::::: */
groupbox {
border: 2px groove #C7D0D9;
padding: 5px;
margin: 5px;
}
.groupbox-body {
padding: inherit;
}

2
themes/modern/jar.mn
View File

@ -314,6 +314,7 @@ modern.jar:
skin/modern/global/formatting.css (global/formatting.css)
skin/modern/global/global.css (global/global.css)
skin/modern/global/globalBindings.xml (global/globalBindings.xml)
skin/modern/global/groupbox.css (global/groupbox.css)
skin/modern/global/menu.css (global/menu.css)
skin/modern/global/menubutton.css (global/menubutton.css)
skin/modern/global/menulist.css (global/menulist.css)
@ -329,7 +330,6 @@ modern.jar:
skin/modern/global/spinbuttons.css (global/spinbuttons.css)
skin/modern/global/tabbox.css (global/tabbox.css)
skin/modern/global/textbox.css (global/textbox.css)
skin/modern/global/titledbox.css (global/titledbox.css)
skin/modern/global/toolbar.css (global/toolbar.css)
skin/modern/global/tree.css (global/tree.css)
skin/modern/global/wizard.css (global/wizard.css)

2
xpfe/global/jar.mn
View File

@ -47,6 +47,7 @@ toolkit.jar:
content/global/bindings/checkbox.xml (resources/content/bindings/checkbox.xml)
content/global/bindings/colorpicker.xml (resources/content/bindings/colorpicker.xml)
content/global/bindings/general.xml (resources/content/bindings/general.xml)
content/global/bindings/groupbox.xml (resources/content/bindings/groupbox.xml)
content/global/bindings/menu.xml (resources/content/bindings/menu.xml)
content/global/bindings/menulist.xml (resources/content/bindings/menulist.xml)
content/global/bindings/menubutton.xml (resources/content/bindings/menubutton.xml)
@ -63,7 +64,6 @@ toolkit.jar:
content/global/bindings/tabbox.xml (resources/content/bindings/tabbox.xml)
content/global/bindings/text.xml (resources/content/bindings/text.xml)
content/global/bindings/textbox.xml (resources/content/bindings/textbox.xml)
content/global/bindings/titledbox.xml (resources/content/bindings/titledbox.xml)
content/global/bindings/toolbar.xml (resources/content/bindings/toolbar.xml)
content/global/bindings/tree.xml (resources/content/bindings/tree.xml)
content/global/bindings/tree.css (resources/content/bindings/tree.css)

24
xpfe/global/resources/content/bindings/groupbox.xml
View File

@ -6,14 +6,14 @@
<binding id="groupbox-base">
<resources>
<stylesheet src="chrome://global/skin/titledbox.css"/>
<stylesheet src="chrome://global/skin/groupbox.css"/>
</resources>
</binding>
<binding id="groupbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
<binding id="groupbox" extends="chrome://global/content/bindings/groupbox.xml#groupbox-base">
<content>
<xul:hbox class="groupbox-title" align="center" pack="start">
<children includes="label"/>
<children includes="caption"/>
</xul:hbox>
<xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
<children/>
@ -21,16 +21,16 @@
</content>
</binding>
<!-- titledbox included for backwards compatibility purposes; to be removed at a later date -->
<binding id="titledbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
<binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
<content>
<xul:hbox class="groupbox-title" align="center">
<children includes="label"/>
</xul:hbox>
<xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
<children/>
<xul:box inherits="orient,align,pack,dir" align="center" pack="center">
<children>
<xul:image class="caption-icon" inherits="src=image"/>
<xul:label class="caption-text" flex="1"
inherits="default,value=label,crop,accesskey"/>
</children>
</xul:box>
</content>
</content>
</binding>
</bindings>

36
xpfe/global/resources/content/bindings/titledbox.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0"?>
<bindings id="groupboxBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="groupbox-base">
<resources>
<stylesheet src="chrome://global/skin/titledbox.css"/>
</resources>
</binding>
<binding id="groupbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
<content>
<xul:hbox class="groupbox-title" align="center" pack="start">
<children includes="caption"/>
</xul:hbox>
<xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
<children/>
</xul:box>
</content>
</binding>
<binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
<content>
<xul:box inherits="orient,align,pack,dir" align="center" pack="center">
<children>
<xul:image class="caption-icon" inherits="src=image"/>
<xul:label class="caption-text" flex="1"
inherits="default,value=label,crop,accesskey"/>
</children>
</xul:box>
</content>
</binding>
</bindings>

4
xpfe/global/resources/content/xul.css
View File

@ -136,12 +136,12 @@ radio {
/******** groupbox *********/
groupbox {
-moz-binding: url("chrome://global/content/bindings/titledbox.xml#groupbox");
-moz-binding: url("chrome://global/content/bindings/groupbox.xml#groupbox");
display: -moz-groupbox;
}
caption {
-moz-binding: url("chrome://global/content/bindings/titledbox.xml#caption");
-moz-binding: url("chrome://global/content/bindings/groupbox.xml#caption");
}
.groupbox-body {