Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11794


Ignore:
Timestamp:
Feb 20, 2018, 11:55:06 PM (6 years ago)
Author:
landauf
Message:

merged cegui0.8 into new branch (with some adaptions for "JuuButton" in *.looknfeel)

Location:
data/branches/cegui0.8_ogre1.9
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • data/branches/cegui0.8_ogre1.9

  • data/branches/cegui0.8_ogre1.9/gui/fonts/Font.xsd

    r5701 r11794  
    1010        </xsd:complexType>
    1111        <xsd:complexType name="MapType">
    12                 <xsd:attribute name="Codepoint" type="xsd:nonNegativeInteger" use="required" />
    13                 <xsd:attribute name="Image" type="xsd:string" use="required" />
    14                 <xsd:attribute name="HorzAdvance" type="xsd:integer" use="optional" default="-1" />
     12                <xsd:attribute name="codepoint" type="xsd:nonNegativeInteger" use="required" />
     13                <xsd:attribute name="image" type="xsd:string" use="required" />
     14                <xsd:attribute name="horzAdvance" type="xsd:integer" use="optional" default="-1" />
    1515        </xsd:complexType>
    1616        <xsd:attributeGroup name="FontAttrs">
    17                 <xsd:attribute name="Name" type="xsd:string" use="required" />
    18                 <xsd:attribute name="Filename" type="xsd:string" use="required" />
    19                 <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
    20                 <xsd:attribute name="Type" use="required">
     17                <xsd:attribute name="name" type="xsd:string" use="required" />
     18                <xsd:attribute name="filename" type="xsd:string" use="required" />
     19                <xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
     20                <xsd:attribute name="type" use="required">
    2121                        <xsd:simpleType>
    2222                                <xsd:restriction base="xsd:string">
     
    2626                        </xsd:simpleType>
    2727                </xsd:attribute>
    28                 <xsd:attribute name="Size" type="xsd:nonNegativeInteger" use="optional" default="12" />
    29                 <xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
    30                 <xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
    31                 <xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
    32                 <xsd:attribute name="AntiAlias" type="xsd:boolean" use="optional" default="true" />
     28                <xsd:attribute name="size" type="xsd:nonNegativeInteger" use="optional" default="12" />
     29                <xsd:attribute name="nativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
     30                <xsd:attribute name="nativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
     31                <xsd:attribute name="autoScaled" default="false">
     32                        <xsd:simpleType>
     33                                <xsd:restriction base="xsd:string">
     34                                        <xsd:enumeration value="false" />
     35                                        <xsd:enumeration value="vertical" />
     36                                        <xsd:enumeration value="horizontal" />
     37                                        <xsd:enumeration value="min" />
     38                                        <xsd:enumeration value="max" />
     39                                        <xsd:enumeration value="true" />
     40                                </xsd:restriction>
     41                        </xsd:simpleType>
     42                </xsd:attribute>
     43                <xsd:attribute name="antiAlias" type="xsd:boolean" use="optional" default="true" />
     44                <xsd:attribute name="lineSpacing" type="xsd:decimal" use="optional" default="0" />
     45                <xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
    3346        </xsd:attributeGroup>
    3447</xsd:schema>
  • data/branches/cegui0.8_ogre1.9/gui/imagesets/Imageset.xsd

    r5701 r11794  
    88                        <xsd:element name="Image" type="ImageType" maxOccurs="unbounded"/>
    99                </xsd:sequence>
    10                 <xsd:attribute name="Imagefile" type="xsd:string" use="required"/>
    11                 <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
    12                 <xsd:attribute name="Name" type="xsd:string" use="required"/>
    13                 <xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
    14                 <xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
    15                 <xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
     10                <xsd:attribute name="imagefile" type="xsd:string" use="required"/>
     11                <xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
     12                <xsd:attribute name="name" type="xsd:string" use="required"/>
     13                <xsd:attribute name="nativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
     14                <xsd:attribute name="nativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
     15                <xsd:attribute name="autoScaled" default="false">
     16                        <xsd:simpleType>
     17                                <xsd:restriction base="xsd:string">
     18                                        <xsd:enumeration value="false" />
     19                                        <xsd:enumeration value="vertical" />
     20                                        <xsd:enumeration value="horizontal" />
     21                                        <xsd:enumeration value="min" />
     22                                        <xsd:enumeration value="max" />
     23                                        <xsd:enumeration value="true" />
     24                                </xsd:restriction>
     25                        </xsd:simpleType>
     26                </xsd:attribute>
     27                <xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
    1628        </xsd:complexType>
    1729       
    1830        <xsd:complexType name="ImageType">
    19                 <xsd:attribute name="Name" type="xsd:string" use="required"/>
    20                 <xsd:attribute name="XPos" type="xsd:nonNegativeInteger" use="required"/>
    21                 <xsd:attribute name="YPos" type="xsd:nonNegativeInteger" use="required"/>
    22                 <xsd:attribute name="Width" type="xsd:nonNegativeInteger" use="required"/>
    23                 <xsd:attribute name="Height" type="xsd:nonNegativeInteger" use="required"/>
    24                 <xsd:attribute name="XOffset" type="xsd:integer" use="optional" default="0"/>
    25                 <xsd:attribute name="YOffset" type="xsd:integer" use="optional" default="0"/>
     31        <xsd:sequence>
     32            <xsd:any minOccurs="0" processContents="skip" maxOccurs="unbounded" />
     33        </xsd:sequence>
     34                <xsd:attribute name="name" type="xsd:string" use="required"/>
     35                <xsd:attribute name="type" type="xsd:string" use="optional" default="BasicImage" />
     36                <xsd:anyAttribute processContents="skip" />
    2637        </xsd:complexType>
    2738
  • data/branches/cegui0.8_ogre1.9/gui/looknfeels/Falagard.xsd

    r7708 r11794  
    66                        <xsd:element name="WidgetLook" type="widgetLookType" minOccurs="0" maxOccurs="unbounded" />
    77                </xsd:sequence>
     8                <xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
    89        </xsd:complexType>
    910        <xsd:complexType name="widgetLookType">
    1011                <xsd:sequence>
     12            <xsd:element name="EventLinkDefinition" type="eventLinkDefinitionType" minOccurs="0" maxOccurs="unbounded" />
    1113            <xsd:element name="PropertyDefinition" type="propertyDefinitionType" minOccurs="0" maxOccurs="unbounded" />
    1214            <xsd:element name="PropertyLinkDefinition" type="propertyLinkDefinitionType" minOccurs="0" maxOccurs="unbounded" />
     
    1618                        <xsd:element name="ImagerySection" type="imagerySectionType" minOccurs="0" maxOccurs="unbounded" />
    1719                        <xsd:element name="StateImagery" type="stateType" minOccurs="0" maxOccurs="unbounded" />
    18                 </xsd:sequence>
    19                 <xsd:attribute name="name" type="xsd:string" use="required" />
     20                        <xsd:element name="AnimationDefinition" type="animAnimationDefinitionType" minOccurs="0" maxOccurs="unbounded" />
     21                </xsd:sequence>
     22                <xsd:attribute name="name" type="xsd:string" use="required" />
     23                <xsd:attribute name="inherits" type="xsd:string" use="optional" default="" />
    2024        </xsd:complexType>
    2125    <xsd:complexType name="propertyDefinitionType">
     
    2529        <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" />
    2630        <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" />
     31        <xsd:attribute name="help" type="xsd:string" use="optional" default="Falagard custom property definition - gets/sets a named user string." />
     32        <xsd:attribute name="fireEvent" type="xsd:string" use="optional" default="" />
    2733    </xsd:complexType>
    2834    <xsd:complexType name="propertyLinkDefinitionType">
     35                <xsd:sequence>
     36                        <xsd:element name="PropertyLinkTarget" type="propertyLinkTargetType" minOccurs="0" maxOccurs="unbounded" />
     37                </xsd:sequence>
    2938        <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" />
    3039        <xsd:attribute name="name" type="xsd:string" use="required" />
    31         <xsd:attribute name="widget" type="xsd:string" use="required" />
     40        <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
    3241        <xsd:attribute name="targetProperty" type="xsd:string" use="optional" default="" />
    3342        <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" />
    3443        <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" />
    3544        <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" />
     45        <xsd:attribute name="fireEvent" type="xsd:string" use="optional" default="" />
     46    </xsd:complexType>
     47    <xsd:complexType name="propertyLinkTargetType">
     48        <xsd:attribute name="widget" type="xsd:string" use="required" />
     49        <xsd:attribute name="property" type="xsd:string" use="optional" default="" />
     50    </xsd:complexType>
     51    <xsd:complexType name="eventLinkDefinitionType">
     52                <xsd:sequence>
     53                        <xsd:element name="EventLinkTarget" type="eventLinkTargetType" minOccurs="0" maxOccurs="unbounded" />
     54                </xsd:sequence>
     55        <xsd:attribute name="name" type="xsd:string" use="required" />
     56        <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
     57        <xsd:attribute name="event" type="xsd:string" use="optional" default="" />
     58    </xsd:complexType>
     59    <xsd:complexType name="eventLinkTargetType">
     60        <xsd:attribute name="widget" type="xsd:string" use="required" />
     61        <xsd:attribute name="event" type="xsd:string" use="optional" default="" />
    3662    </xsd:complexType>
    3763    <xsd:complexType name="namedAreaType">
    3864        <xsd:sequence>
    39             <xsd:element name="Area" type="componentAreaType" />
     65            <xsd:element name="Area" type="componentAreaType" minOccurs="0" maxOccurs="1" />
    4066        </xsd:sequence>
    4167        <xsd:attribute name="name" type="xsd:string" use="required" />
     
    6490        <xsd:attribute name="section" type="xsd:string" use="required" />
    6591        <xsd:attribute name="controlProperty" type="xsd:string" use="optional" default="" />
     92        <xsd:attribute name="controlValue" type="xsd:string" use="optional" default="" />
     93        <xsd:attribute name="controlWidget" type="xsd:string" use="optional" default="" />
    6694    </xsd:complexType>
    6795        <xsd:complexType name="imagerySectionType">
     
    81109    <xsd:complexType name="frameComponentType">
    82110        <xsd:sequence>
    83             <xsd:element name="Area" type="componentAreaType" />
    84             <xsd:element name="Image" type="frameImageType" minOccurs="0" maxOccurs="9" />
     111            <xsd:element name="Area" type="componentAreaType" minOccurs="0" maxOccurs="1" />
     112            <xsd:choice  minOccurs="0" maxOccurs="9">
     113                <xsd:element name="Image" type="frameImageType" />
     114                <xsd:element name="ImageProperty" type="frameImageType" />
     115            </xsd:choice>
    85116            <xsd:choice  minOccurs="0" maxOccurs="1">
    86117                <xsd:element name="Colour" type="colourType" />
     
    89120                <xsd:element name="ColourRectProperty" type="settingByPropertyType" />
    90121            </xsd:choice>
    91             <xsd:choice  minOccurs="0" maxOccurs="1">
    92                 <xsd:element name="VertFormat" type="vertFormatType" />
    93                 <xsd:element name="VertFormatProperty" type="settingByPropertyType" />
    94             </xsd:choice>
    95             <xsd:choice  minOccurs="0" maxOccurs="1">
    96                 <xsd:element name="HorzFormat" type="horzFormatType" />
    97                 <xsd:element name="HorzFormatProperty" type="settingByPropertyType" />
     122            <xsd:choice  minOccurs="0" maxOccurs="3">
     123                <xsd:element name="VertFormat" type="frameVertFormatType" />
     124                <xsd:element name="VertFormatProperty" type="frameFormatPropertyType" />
     125            </xsd:choice>
     126            <xsd:choice  minOccurs="0" maxOccurs="3">
     127                <xsd:element name="HorzFormat" type="frameHorzFormatType" />
     128                <xsd:element name="HorzFormatProperty" type="frameFormatPropertyType" />
    98129            </xsd:choice>
    99130        </xsd:sequence>
     
    101132    <xsd:complexType name="textComponentType">
    102133        <xsd:sequence>
    103             <xsd:element name="Area" type="componentAreaType" />
     134            <xsd:element name="Area" type="componentAreaType" minOccurs="0" maxOccurs="1" />
    104135            <xsd:element name="Text" type="textStringType" minOccurs="0" maxOccurs="1" />
    105136            <xsd:element name="TextProperty" type="textPropertyType" minOccurs="0" maxOccurs="1" />
     
    123154        <xsd:complexType name="imageryComponentType">
    124155                <xsd:sequence>
    125                         <xsd:element name="Area" type="componentAreaType" />
     156            <xsd:element name="Area" type="componentAreaType" minOccurs="0" maxOccurs="1" />
    126157            <xsd:choice>
    127158                <xsd:element name="Image" type="imageType" />
     
    146177        <xsd:complexType name="widgetComponentType">
    147178                <xsd:sequence>
    148                         <xsd:element name="Area" type="componentAreaType" />
     179            <xsd:element name="EventAction" type="eventActionType" minOccurs="0" maxOccurs="unbounded" />
     180            <xsd:element name="Area" type="componentAreaType" minOccurs="0" maxOccurs="1" />
    149181                        <xsd:element name="VertAlignment" type="vertAlignmentType" minOccurs="0" maxOccurs="1" />
    150182                        <xsd:element name="HorzAlignment" type="horzAlignmentType" minOccurs="0" maxOccurs="1" />
     
    155187                <xsd:attribute name="renderer" type="xsd:string" use="optional" default="" />
    156188                <xsd:attribute name="look" type="xsd:string" use="optional" default="" />
     189                <xsd:attribute name="autoWindow" type="xsd:boolean" use="optional" default="true" />
    157190        </xsd:complexType>
    158191        <xsd:complexType name="horzFormatType">
     
    179212        </xsd:complexType>
    180213        <xsd:complexType name="imageType">
    181                 <xsd:attribute name="imageset" type="xsd:string" use="required" />
    182                 <xsd:attribute name="image" type="xsd:string" use="required" />
     214                <xsd:attribute name="name" type="xsd:string" use="required" />
    183215        </xsd:complexType>
    184216    <xsd:complexType name="frameImageType">
    185         <xsd:attribute name="type" type="frameImageComponentEnum" use="required" />
    186         <xsd:attribute name="imageset" type="xsd:string" use="required" />
    187         <xsd:attribute name="image" type="xsd:string" use="required" />
     217        <xsd:attribute name="component" type="frameImageComponentEnum" use="required" />
     218        <xsd:attribute name="name" type="xsd:string" use="required" />
     219    </xsd:complexType>
     220    <xsd:complexType name="frameVertFormatType">
     221        <xsd:attribute name="component" type="frameImageComponentEnum" use="optional" default="Background" />
     222        <xsd:attribute name="type" type="vertFormatEnum" use="optional" default="Stretched" />
     223    </xsd:complexType>
     224    <xsd:complexType name="frameHorzFormatType">
     225        <xsd:attribute name="component" type="frameImageComponentEnum" use="optional" default="Background" />
     226        <xsd:attribute name="type" type="horzFormatEnum" use="optional" default="Stretched" />
     227    </xsd:complexType>
     228    <xsd:complexType name="frameFormatPropertyType">
     229        <xsd:attribute name="component" type="frameImageComponentEnum" use="optional" default="Background" />
     230        <xsd:attribute name="name" type="xsd:string" use="required" />
    188231    </xsd:complexType>
    189232        <xsd:complexType name="componentAreaType">
    190233        <xsd:choice>
    191234            <xsd:sequence>
    192                 <xsd:element name="Dim" type="dimensionType" minOccurs="4" maxOccurs="4" />
     235                <xsd:element name="Dim" type="dimensionType" minOccurs="1" maxOccurs="4" />
    193236            </xsd:sequence>
    194237            <xsd:element name="AreaProperty" type="settingByPropertyType" />
     238            <xsd:element name="NamedAreaSource" type="namedAreaSourceType" />
    195239        </xsd:choice>
    196240        </xsd:complexType>
     
    200244                        <xsd:element name="AbsoluteDim" type="absoluteDimType" />
    201245                        <xsd:element name="ImageDim" type="imageDimType" />
     246            <xsd:element name="ImagePropertyDim" type="imageDimType" />
    202247            <xsd:element name="WidgetDim" type="widgetDimType" />
    203248            <xsd:element name="FontDim" type="fontDimType" />
    204249            <xsd:element name="PropertyDim" type="propertyDimType" />
     250            <xsd:element name="OperatorDim" type="operatorDimType" />
    205251                </xsd:choice>
    206252                <xsd:attribute name="type" type="dimensionTypeEnum" use="required" />
    207253        </xsd:complexType>
    208254    <xsd:complexType name="fontDimType">
    209         <xsd:sequence>
    210             <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
    211         </xsd:sequence>
    212255        <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
    213256        <xsd:attribute name="font" type="xsd:string" use="optional" default="" />
     
    217260    </xsd:complexType>
    218261    <xsd:complexType name="propertyDimType">
    219         <xsd:sequence>
    220             <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
    221         </xsd:sequence>
    222262        <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
    223263        <xsd:attribute name="name" type="xsd:string" use="required" />
     
    225265    </xsd:complexType>
    226266        <xsd:complexType name="unifiedDimType">
    227         <xsd:sequence>
    228             <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
    229         </xsd:sequence>
    230267                <xsd:attribute name="scale" type="xsd:decimal" use="optional" default="0" />
    231268                <xsd:attribute name="offset" type="xsd:integer" use="optional" default="0" />
     
    233270        </xsd:complexType>
    234271        <xsd:complexType name="absoluteDimType">
    235         <xsd:sequence>
    236             <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
    237         </xsd:sequence>
    238272                <xsd:attribute name="value" type="xsd:decimal" use="optional" default="0" />
    239273        </xsd:complexType>
    240274        <xsd:complexType name="imageDimType">
    241         <xsd:sequence>
    242             <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
    243         </xsd:sequence>
    244                 <xsd:attribute name="imageset" type="xsd:string" use="required" />
    245                 <xsd:attribute name="image" type="xsd:string" use="required" />
     275                <xsd:attribute name="name" type="xsd:string" use="required" />
    246276                <xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" />
    247277        </xsd:complexType>
    248278        <xsd:complexType name="widgetDimType">
    249         <xsd:sequence>
    250             <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
    251         </xsd:sequence>
    252279                <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
    253280                <xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" />
    254281        </xsd:complexType>
     282    <xsd:complexType name="operatorDimType">
     283        <xsd:choice minOccurs="2" maxOccurs="2">
     284                        <xsd:element name="UnifiedDim" type="unifiedDimType" />
     285                        <xsd:element name="AbsoluteDim" type="absoluteDimType" />
     286                        <xsd:element name="ImageDim" type="imageDimType" />
     287            <xsd:element name="ImagePropertyDim" type="imageDimType" />
     288            <xsd:element name="WidgetDim" type="widgetDimType" />
     289            <xsd:element name="FontDim" type="fontDimType" />
     290            <xsd:element name="PropertyDim" type="propertyDimType" />
     291            <xsd:element name="OperatorDim" type="operatorDimType" />
     292        </xsd:choice>
     293        <xsd:attribute name="op" type="dimensionOperatorEnum" use="required" />
     294    </xsd:complexType>
    255295    <xsd:complexType name="settingByPropertyType">
    256296        <xsd:attribute name="name" type="xsd:string" use="required" />
     
    280320        <xsd:attribute name="name" type="xsd:string" use="required" />
    281321    </xsd:complexType>
    282     <xsd:complexType name="dimensionOperatorType">
    283         <xsd:choice>
    284             <xsd:element name="UnifiedDim" type="unifiedDimType" />
    285             <xsd:element name="AbsoluteDim" type="absoluteDimType" />
    286             <xsd:element name="ImageDim" type="imageDimType" />
    287             <xsd:element name="WidgetDim" type="widgetDimType" />
    288             <xsd:element name="FontDim" type="fontDimType" />
    289             <xsd:element name="PropertyDim" type="propertyDimType" />
    290         </xsd:choice>
    291         <xsd:attribute name="op" type="dimensionOperatorEnum" use="required" />
     322    <xsd:complexType name="namedAreaSourceType">
     323        <xsd:attribute name="look" type="xsd:string" use="optional" default="" />
     324        <xsd:attribute name="name" type="xsd:string" use="required" />
     325    </xsd:complexType>
     326    <xsd:complexType name="eventActionType">
     327        <xsd:attribute name="event" type="xsd:string" use="required" />
     328        <xsd:attribute name="action" type="eventActionTypeEnum" use="required" />
    292329    </xsd:complexType>
    293330    <xsd:simpleType name="propertyDimensionTypeEnum">
     
    365402    <xsd:simpleType name="propertyTypeEnum">
    366403        <xsd:restriction base="xsd:string">
     404            <xsd:enumeration value="Colour" />
     405            <xsd:enumeration value="ColourRect" />
     406            <xsd:enumeration value="UBox" />
     407            <xsd:enumeration value="URect" />
     408            <xsd:enumeration value="USize" />
     409            <xsd:enumeration value="UDim" />
     410            <xsd:enumeration value="UVector2" />
     411            <xsd:enumeration value="Sizef" />
     412            <xsd:enumeration value="Vector2f" />
     413            <xsd:enumeration value="Vector3f" />
     414            <xsd:enumeration value="Rectf" />
     415            <xsd:enumeration value="Font" />
     416            <xsd:enumeration value="Image" />
     417            <xsd:enumeration value="Quaternion" />
     418            <xsd:enumeration value="AspectMode" />
     419            <xsd:enumeration value="HorizontalAlignment" />
     420            <xsd:enumeration value="VerticalAlignment" />
     421            <xsd:enumeration value="HorizontalTextFormatting" />
     422            <xsd:enumeration value="VerticalTextFormatting" />
     423            <xsd:enumeration value="WindowUpdateMode" />
     424            <xsd:enumeration value="bool" />
     425            <xsd:enumeration value="uint" />
     426            <xsd:enumeration value="unsigned long" />
     427            <xsd:enumeration value="int" />
     428            <xsd:enumeration value="float" />
     429            <xsd:enumeration value="double" />
     430            <xsd:enumeration value="TabControl::TabPanePosition" />
     431            <xsd:enumeration value="Spinner::TextInputMode" />
     432            <xsd:enumeration value="ItemListBase::SortMode" />
     433            <xsd:enumeration value="ListHeaderSegment::SortDirection" />
     434            <xsd:enumeration value="MultiColumnList::SelectionMode" />
     435            <xsd:enumeration value="VerticalFormatting" />
     436            <xsd:enumeration value="HorizontalFormatting" />
     437            <xsd:enumeration value="Range" />
     438            <xsd:enumeration value="String" />
    367439            <xsd:enumeration value="Generic" />
    368440        </xsd:restriction>
     
    397469        </xsd:restriction>
    398470    </xsd:simpleType>
     471    <xsd:simpleType name="eventActionTypeEnum">
     472        <xsd:restriction base="xsd:string">
     473            <xsd:enumeration value="Redraw" />
     474            <xsd:enumeration value="Layout" />
     475        </xsd:restriction>
     476    </xsd:simpleType>
     477
     478
     479
     480        <xsd:complexType name="animAnimationDefinitionType">
     481        <xsd:sequence>
     482            <xsd:element name="Affector" type="animAffectorType" minOccurs="1" maxOccurs="unbounded" />
     483            <xsd:element name="Subscription" type="animSubscriptionType" minOccurs="0" maxOccurs="unbounded" />
     484        </xsd:sequence>
     485                <xsd:attribute name="name" type="xsd:string" use="required" />
     486                <xsd:attribute name="duration" type="xsd:decimal" use="required" />
     487                <xsd:attribute name="replayMode" type="animReplayModeEnum" use="optional" default="loop" />
     488                <xsd:attribute name="autoStart" type="xsd:boolean" use="optional" default="false" />
     489        </xsd:complexType>
     490        <xsd:complexType name="animAffectorType">
     491        <xsd:sequence>
     492            <xsd:element name="KeyFrame" type="animKeyFrameType" minOccurs="1" maxOccurs="unbounded" />
     493        </xsd:sequence>
     494                <xsd:attribute name="applicationMethod" type="animApplicationMethodEnum" use="optional" default="absolute" />
     495                <xsd:attribute name="property" type="xsd:string" use="required" />
     496                <xsd:attribute name="interpolator" type="xsd:string" use="required" />
     497        </xsd:complexType>
     498        <xsd:complexType name="animKeyFrameType">
     499                <xsd:attribute name="position" type="xsd:decimal" use="required" />
     500                <xsd:attribute name="value" type="xsd:string" use="optional" default="" />
     501                <xsd:attribute name="progression" type="xsd:string" use="optional" default="" />
     502                <xsd:attribute name="sourceProperty" type="xsd:string" use="optional" default="" />
     503        </xsd:complexType>
     504        <xsd:complexType name="animSubscriptionType">
     505                <xsd:attribute name="event" type="xsd:string" use="required" />
     506                <xsd:attribute name="action" type="animActionEnum" use="required" />
     507        </xsd:complexType>
     508    <xsd:simpleType name="animReplayModeEnum">
     509        <xsd:restriction base="xsd:string">
     510            <xsd:enumeration value="once" />
     511            <xsd:enumeration value="loop" />
     512            <xsd:enumeration value="bounce" />
     513        </xsd:restriction>
     514    </xsd:simpleType>
     515    <xsd:simpleType name="animApplicationMethodEnum">
     516        <xsd:restriction base="xsd:string">
     517            <xsd:enumeration value="absolute" />
     518            <xsd:enumeration value="relative" />
     519            <xsd:enumeration value="relative multiply" />
     520        </xsd:restriction>
     521    </xsd:simpleType>
     522    <xsd:simpleType name="animProgressionEnum">
     523        <xsd:restriction base="xsd:string">
     524            <xsd:enumeration value="linear" />
     525            <xsd:enumeration value="discrete" />
     526            <xsd:enumeration value="quadratic accelerating" />
     527            <xsd:enumeration value="quadratic decelerating" />
     528        </xsd:restriction>
     529    </xsd:simpleType>
     530    <xsd:simpleType name="animActionEnum">
     531        <xsd:restriction base="xsd:string">
     532            <xsd:enumeration value="Start" />
     533            <xsd:enumeration value="Stop" />
     534            <xsd:enumeration value="Pause" />
     535            <xsd:enumeration value="Unpause" />
     536            <xsd:enumeration value="TogglePause" />
     537        </xsd:restriction>
     538    </xsd:simpleType>
     539
    399540</xsd:schema>
  • data/branches/cegui0.8_ogre1.9/gui/looknfeels/OrxonoxLook.looknfeel

    r11792 r11794  
    99        <PropertyDefinition initialValue="CentreAligned" name="HorzLabelFormatting" />
    1010        <PropertyDefinition initialValue="" name="NormalImage" redrawOnWrite="true" />
    11         <PropertyDefinition initialValue="set:OrxonoxLook image:ButtonMiddleNormal" name="NormalImageBackground" redrawOnWrite="true" />
    12         <PropertyDefinition initialValue="set:OrxonoxLook image:ButtonRightNormal" name="NormalImageRightEdge" redrawOnWrite="true" />
    13         <PropertyDefinition initialValue="set:OrxonoxLook image:ButtonLeftNormal" name="NormalImageLeftEdge" redrawOnWrite="true" />
     11        <PropertyDefinition initialValue="OrxonoxLook/ButtonMiddleNormal" name="NormalImageBackground" redrawOnWrite="true" />
     12        <PropertyDefinition initialValue="OrxonoxLook/ButtonRightNormal" name="NormalImageRightEdge" redrawOnWrite="true" />
     13        <PropertyDefinition initialValue="OrxonoxLook/ButtonLeftNormal" name="NormalImageLeftEdge" redrawOnWrite="true" />
    1414        <PropertyDefinition initialValue="" name="HoverImage" redrawOnWrite="true" />
    1515        <PropertyDefinition initialValue="" name="PushedImage" redrawOnWrite="true" />
     
    55395539        <PropertyDefinition initialValue="FFFFFFFF" name="TextColour" redrawOnWrite="true" />
    55405540        <PropertyDefinition initialValue="FFFFFFFF" name="SelectedTextColour" redrawOnWrite="true" />
    5541         <PropertyDefinition initialValue="set:OrxonoxLook image:ListboxSelectionBrush" name="SelectionBrush" redrawOnWrite="true" />
     5541        <PropertyDefinition initialValue="OrxonoxLook/ListboxSelectionBrush" name="SelectionBrush" redrawOnWrite="true" />
    55425542        <PropertyDefinition initialValue="FF4444AA" name="SelectionColour" redrawOnWrite="true" />
    55435543        <Property name="Selectable" value="True" />
     
    57545754        <PropertyDefinition initialValue="CentreAligned" name="HorzLabelFormatting" />
    57555755        <PropertyDefinition initialValue="" name="NormalImage" redrawOnWrite="true" />
    5756         <PropertyDefinition initialValue="set:OrxonoxLook image:ButtonMiddleNormal" name="NormalImageBackground" redrawOnWrite="true" />
    5757         <PropertyDefinition initialValue="set:OrxonoxLook image:ButtonRightNormal" name="NormalImageRightEdge" redrawOnWrite="true" />
    5758         <PropertyDefinition initialValue="set:OrxonoxLook image:ButtonLeftNormal" name="NormalImageLeftEdge" redrawOnWrite="true" />
     5756        <PropertyDefinition initialValue="OrxonoxLook/ButtonMiddleNormal" name="NormalImageBackground" redrawOnWrite="true" />
     5757        <PropertyDefinition initialValue="OrxonoxLook/ButtonRightNormal" name="NormalImageRightEdge" redrawOnWrite="true" />
     5758        <PropertyDefinition initialValue="OrxonoxLook/ButtonLeftNormal" name="NormalImageLeftEdge" redrawOnWrite="true" />
    57595759        <PropertyDefinition initialValue="" name="HoverImage" redrawOnWrite="true" />
    57605760        <PropertyDefinition initialValue="" name="PushedImage" redrawOnWrite="true" />
  • data/branches/cegui0.8_ogre1.9/gui/looknfeels/TaharezGreenLook.looknfeel

    r11792 r11794  
    99        <PropertyDefinition initialValue="CentreAligned" name="HorzLabelFormatting" />
    1010        <PropertyDefinition initialValue="" name="NormalImage" redrawOnWrite="true" />
    11         <PropertyDefinition initialValue="set:TaharezGreenLook image:ButtonMiddleNormal" name="NormalImageBackground" redrawOnWrite="true" />
    12         <PropertyDefinition initialValue="set:TaharezGreenLook image:ButtonRightNormal" name="NormalImageRightEdge" redrawOnWrite="true" />
    13         <PropertyDefinition initialValue="set:TaharezGreenLook image:ButtonLeftNormal" name="NormalImageLeftEdge" redrawOnWrite="true" />
     11        <PropertyDefinition initialValue="TaharezGreenLook/ButtonMiddleNormal" name="NormalImageBackground" redrawOnWrite="true" />
     12        <PropertyDefinition initialValue="TaharezGreenLook/ButtonRightNormal" name="NormalImageRightEdge" redrawOnWrite="true" />
     13        <PropertyDefinition initialValue="TaharezGreenLook/ButtonLeftNormal" name="NormalImageLeftEdge" redrawOnWrite="true" />
    1414        <PropertyDefinition initialValue="" name="HoverImage" redrawOnWrite="true" />
    1515        <PropertyDefinition initialValue="" name="PushedImage" redrawOnWrite="true" />
     
    55385538        <PropertyDefinition initialValue="FFFFFFFF" name="TextColour" redrawOnWrite="true" />
    55395539        <PropertyDefinition initialValue="FFFFFFFF" name="SelectedTextColour" redrawOnWrite="true" />
    5540         <PropertyDefinition initialValue="set:TaharezGreenLook image:ListboxSelectionBrush" name="SelectionBrush" redrawOnWrite="true" />
     5540        <PropertyDefinition initialValue="TaharezGreenLook/ListboxSelectionBrush" name="SelectionBrush" redrawOnWrite="true" />
    55415541        <PropertyDefinition initialValue="FF4444AA" name="SelectionColour" redrawOnWrite="true" />
    55425542        <Property name="Selectable" value="True" />
     
    57535753        <PropertyDefinition initialValue="CentreAligned" name="HorzLabelFormatting" />
    57545754        <PropertyDefinition initialValue="" name="NormalImage" redrawOnWrite="true" />
    5755         <PropertyDefinition initialValue="set:TaharezGreenLook image:JuuButton" name="NormalImageBackground" redrawOnWrite="true" />
    5756         <PropertyDefinition initialValue="set:TaharezGreenLook image:JuuButton" name="NormalImageRightEdge" redrawOnWrite="true" />
    5757         <PropertyDefinition initialValue="set:TaharezGreenLook image:JuuButton" name="NormalImageLeftEdge" redrawOnWrite="true" />
     5755        <PropertyDefinition initialValue="TaharezGreenLook/JuuButton" name="NormalImageBackground" redrawOnWrite="true" />
     5756        <PropertyDefinition initialValue="TaharezGreenLook/JuuButton" name="NormalImageRightEdge" redrawOnWrite="true" />
     5757        <PropertyDefinition initialValue="TaharezGreenLook/JuuButton" name="NormalImageLeftEdge" redrawOnWrite="true" />
    57585758        <PropertyDefinition initialValue="" name="HoverImage" redrawOnWrite="true" />
    57595759        <PropertyDefinition initialValue="" name="PushedImage" redrawOnWrite="true" />
  • data/branches/cegui0.8_ogre1.9/gui/looknfeels/TaharezLook.looknfeel

    r11792 r11794  
    54705470        <PropertyDefinition initialValue="FFFFFFFF" name="TextColour" redrawOnWrite="true" />
    54715471        <PropertyDefinition initialValue="FFFFFFFF" name="SelectedTextColour" redrawOnWrite="true" />
    5472         <PropertyDefinition initialValue="set:TaharezLook image:ListboxSelectionBrush" name="SelectionBrush" redrawOnWrite="true" />
     5472        <PropertyDefinition initialValue="TaharezLook/ListboxSelectionBrush" name="SelectionBrush" redrawOnWrite="true" />
    54735473        <PropertyDefinition initialValue="FF4444AA" name="SelectionColour" redrawOnWrite="true" />
    54745474        <Property name="Selectable" value="True" />
  • data/branches/cegui0.8_ogre1.9/gui/looknfeels/WindowsLook.looknfeel

    r11792 r11794  
    15711571        <PropertyDefinition initialValue="FF000000" name="TextColour" redrawOnWrite="true" />
    15721572        <PropertyDefinition initialValue="FFFFFFFF" name="SelectedTextColour" redrawOnWrite="true" />
    1573         <PropertyDefinition initialValue="set:WindowsLook image:Background" name="SelectionBrush" redrawOnWrite="true" />
     1573        <PropertyDefinition initialValue="WindowsLook/Background" name="SelectionBrush" redrawOnWrite="true" />
    15741574        <PropertyDefinition initialValue="FF3030FF" name="SelectionColour" redrawOnWrite="true" />
    15751575        <Property name="Selectable" value="True" />
Note: See TracChangeset for help on using the changeset viewer.