[Orxonox-commit 2892] r7595 - data/trunk/gui/looknfeel

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-10-27 22:40:22 +0200 (Wed, 27 Oct 2010)
New Revision: 7595

Modified:
   data/trunk/gui/looknfeel/TaharezGreenLook.looknfeel
Log:
Adjustment to TaharezGreenLook to make the look of buttons adjustable.


Modified: data/trunk/gui/looknfeel/TaharezGreenLook.looknfeel
===================================================================
--- data/trunk/gui/looknfeel/TaharezGreenLook.looknfeel	2010-10-27 20:39:48 UTC (rev 7594)
+++ data/trunk/gui/looknfeel/TaharezGreenLook.looknfeel	2010-10-27 20:40:22 UTC (rev 7595)
@@ -13,6 +13,9 @@
         <PropertyDefinition name="VertLabelFormatting" initialValue="CentreAligned" />
         <PropertyDefinition name="HorzLabelFormatting" initialValue="CentreAligned" />
         <PropertyDefinition name="NormalImage" initialValue="" redrawOnWrite="true" />
+        <PropertyDefinition name="NormalImageBackground" initialValue="set:TaharezGreenLook image:ButtonMiddleNormal" redrawOnWrite="true" />
+        <PropertyDefinition name="NormalImageRightEdge" initialValue="set:TaharezGreenLook image:ButtonRightNormal" redrawOnWrite="true" />
+        <PropertyDefinition name="NormalImageLeftEdge" initialValue="set:TaharezGreenLook image:ButtonLeftNormal" redrawOnWrite="true" />
         <PropertyDefinition name="HoverImage" initialValue="" redrawOnWrite="true" />
         <PropertyDefinition name="PushedImage" initialValue="" redrawOnWrite="true" />
         <PropertyDefinition name="DisabledImage" initialValue="" redrawOnWrite="true" />
@@ -31,17 +34,33 @@
             </TextComponent>
         </ImagerySection>
         <ImagerySection name="normal">
-            <FrameComponent>
+            <ImageryComponent>
                 <Area>
-                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="Width"><UnifiedDim scale="1" type="Width" /></Dim>
-                    <Dim type="Height"><UnifiedDim scale="1" type="Height" /></Dim>
+                    <Dim type="LeftEdge" >
+                        <AbsoluteDim value="0" >
+                            <DimOperator op="Add">
+                                <ImageDim imageset="TaharezGreenLook" image="ButtonLeftNormal" dimension="Width" />
+                            </DimOperator>
+                        </AbsoluteDim>
+                    </Dim>
+                    <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
+                    <Dim type="Width" >
+                        <UnifiedDim scale="1" type="Width">
+                            <DimOperator op="Subtract">
+                                <ImageDim imageset="TaharezGreenLook" image="ButtonLeftNormal" dimension="Width">
+                                    <DimOperator op="Add">
+                                        <ImageDim imageset="TaharezGreenLook" image="ButtonRightNormal" dimension="Width" />
+                                    </DimOperator>
+                                </ImageDim>
+                            </DimOperator>
+                        </UnifiedDim>
+                    </Dim>
+                    <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
                 </Area>
-                <Image type="LeftEdge" imageset="TaharezGreenLook" image="ButtonLeftNormal" />
-                <Image type="RightEdge" imageset="TaharezGreenLook" image="ButtonRightNormal" />
-                <Image type="Background" imageset="TaharezGreenLook" image="ButtonMiddleNormal" />
-            </FrameComponent>
+                <ImageProperty name="NormalImageBackground" />
+                <VertFormatProperty name="VertImageFormatting" />
+                <HorzFormatProperty name="HorzImageFormatting" />
+            </ImageryComponent>
             <ImageryComponent>
                 <Area>
                     <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
@@ -49,6 +68,27 @@
                     <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
                     <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
                 </Area>
+                <ImageProperty name="NormalImageRightEdge" />
+                <VertFormatProperty name="VertImageFormatting" />
+                <HorzFormat type="RightAligned" />
+            </ImageryComponent>
+            <ImageryComponent>
+                <Area>
+                    <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
+                    <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
+                    <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
+                </Area>
+                <ImageProperty name="NormalImageLeftEdge" />
+                <VertFormatProperty name="VertImageFormatting" />
+            </ImageryComponent>
+            <ImageryComponent>
+                <Area>
+                    <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
+                    <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
+                    <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
+                </Area>
                 <ImageProperty name="NormalImage" />
                 <VertFormatProperty name="VertImageFormatting" />
                 <HorzFormatProperty name="HorzImageFormatting" />
@@ -1764,7 +1804,8 @@
         <PropertyDefinition name="BackgroundColor" initialValue="FFFFFFFF" redrawOnWrite="true" />
         <NamedArea name="ItemRenderingArea">
             <Area>
-                <Dim type="LeftEdge" ><ImageDim imageset="TaharezGreenLook" image="ListboxLeft" dimension="Width" /></Dim>
+                <Dim type="LeftEdge" ><ImageDim imageset="TaharezGreenLook" image="ListboxLeft" dimension
+="Width" /></Dim>
                 <Dim type="TopEdge" ><ImageDim imageset="TaharezGreenLook" image="ListboxTop" dimension="Height" /></Dim>
                 <Dim type="RightEdge" >
                     <UnifiedDim scale="1" type="RightEdge">