details: http://crayzedsgui.hg.sourceforge.net/hgweb/crayzedsgui/cegui_mk2/rev/ba89931d3dc2
changeset: 3218:ba89931d3dc2
user: Paul Turner <paul@...>
date: Mon Mar 12 17:15:19 2012 +0000
branch:
description:
Fix some incorrect property definition types.
diffstat:
datafiles/looknfeel/OgreTray.looknfeel | 8 ++++----
datafiles/looknfeel/TaharezLook.looknfeel | 12 ++++++------
datafiles/looknfeel/Vanilla.looknfeel | 8 ++++----
datafiles/looknfeel/WindowsLook.looknfeel | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diffs (100 lines):
diff -r e57e59ad8cfe -r ba89931d3dc2 datafiles/looknfeel/OgreTray.looknfeel
--- a/datafiles/looknfeel/OgreTray.looknfeel Sat Mar 10 20:54:40 2012 +0000
+++ b/datafiles/looknfeel/OgreTray.looknfeel Mon Mar 12 17:15:19 2012 +0000
@@ -2474,8 +2474,8 @@
-->
<WidgetLook name="OgreTray/StaticImage">
<PropertyDefinition name="ImageColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
- <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting"/>
- <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting"/>
+ <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting"/>
+ <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting"/>
<Property name="BackgroundEnabled" value="True" />
<Property name="FrameEnabled" value="True" />
<ImagerySection name="image_withframe">
@@ -2555,8 +2555,8 @@
-->
<WidgetLook name="OgreTray/AltStaticImage">
<PropertyDefinition name="ImageColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
- <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting"/>
- <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting"/>
+ <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting"/>
+ <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting"/>
<PropertyDefinition name="FrameEnabled" initialValue="True" redrawOnWrite="true" type="bool"/>
<PropertyDefinition name="Image" initialValue="" redrawOnWrite="true" type="Image"/>
<ImagerySection name="image">
diff -r e57e59ad8cfe -r ba89931d3dc2 datafiles/looknfeel/TaharezLook.looknfeel
--- a/datafiles/looknfeel/TaharezLook.looknfeel Sat Mar 10 20:54:40 2012 +0000
+++ b/datafiles/looknfeel/TaharezLook.looknfeel Mon Mar 12 17:15:19 2012 +0000
@@ -54,8 +54,8 @@
<PropertyDefinition name="HoverImage" initialValue="" redrawOnWrite="true" type="Image"/>
<PropertyDefinition name="PushedImage" initialValue="" redrawOnWrite="true" type="Image"/>
<PropertyDefinition name="DisabledImage" initialValue="" redrawOnWrite="true" type="Image"/>
- <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting" />
- <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting" />
+ <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting" />
+ <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting" />
<ImagerySection name="label">
<TextComponent>
<VertFormatProperty name="VertLabelFormatting" />
@@ -2006,8 +2006,8 @@
<PropertyDefinition name="ImageColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
<PropertyDefinition name="FrameColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
<PropertyDefinition name="BackgroundColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
- <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting"/>
- <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting"/>
+ <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting"/>
+ <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting"/>
<Property name="BackgroundEnabled" value="True" />
<Property name="FrameEnabled" value="True" />
<ImagerySection name="image_withframe">
@@ -3942,8 +3942,8 @@
<PropertyDefinition name="HoverImage" initialValue="" redrawOnWrite="true" type="Image"/>
<PropertyDefinition name="PushedImage" initialValue="" redrawOnWrite="true" type="Image"/>
<PropertyDefinition name="DisabledImage" initialValue="" redrawOnWrite="true" type="Image"/>
- <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting" />
- <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting" />
+ <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting" />
+ <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting" />
<ImagerySection name="normal">
<ImageryComponent>
<ImageProperty name="NormalImage" />
diff -r e57e59ad8cfe -r ba89931d3dc2 datafiles/looknfeel/Vanilla.looknfeel
--- a/datafiles/looknfeel/Vanilla.looknfeel Sat Mar 10 20:54:40 2012 +0000
+++ b/datafiles/looknfeel/Vanilla.looknfeel Mon Mar 12 17:15:19 2012 +0000
@@ -154,8 +154,8 @@
<PropertyDefinition name="NormalImage" initialValue="" redrawOnWrite="true" type="Image"/>
<PropertyDefinition name="HoverImage" initialValue="" redrawOnWrite="true" type="Image"/>
<PropertyDefinition name="PushedImage" initialValue="" redrawOnWrite="true" type="Image"/>
- <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting"/>
- <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting"/>
+ <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting"/>
+ <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting"/>
<Property name="WantsMultiClickEvents" value="False" />
<ImagerySection name="label">
@@ -771,8 +771,8 @@
<WidgetLook name="Vanilla/StaticImage">
<PropertyDefinition name="ImageColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
- <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting" />
- <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting" />
+ <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting" />
+ <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting" />
<Property name="BackgroundEnabled" value="True" />
<Property name="FrameEnabled" value="True" />
<ImagerySection name="image_withframe">
diff -r e57e59ad8cfe -r ba89931d3dc2 datafiles/looknfeel/WindowsLook.looknfeel
--- a/datafiles/looknfeel/WindowsLook.looknfeel Sat Mar 10 20:54:40 2012 +0000
+++ b/datafiles/looknfeel/WindowsLook.looknfeel Mon Mar 12 17:15:19 2012 +0000
@@ -3688,8 +3688,8 @@
<PropertyDefinition name="ImageColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
<PropertyDefinition name="FrameColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" type="ColourRect"/>
<PropertyDefinition name="BackgroundColours" initialValue="tl:FFDFDFDF tr:FFDFDFDF bl:FFDFDFDF br:FFDFDFDF" redrawOnWrite="true" type="ColourRect"/>
- <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VerticalFormatting"/>
- <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorizontalFormatting"/>
+ <PropertyDefinition name="VertFormatting" initialValue="Stretched" redrawOnWrite="true" type="VertFormatting"/>
+ <PropertyDefinition name="HorzFormatting" initialValue="Stretched" redrawOnWrite="true" type="HorzFormatting"/>
<Property name="BackgroundEnabled" value="True" />
<Property name="FrameEnabled" value="True" />
<ImagerySection name="image_withframe">
|