Mercurial > sumwars
changeset 2678:38bcb6ae4698 gussoundtest
refs #29: Fixed a bunch of XML definitions. (side-note; I cannot believe how many errors there were and how small some issues were).
| author | Augustin Preda (dezGusty) |
|---|---|
| date | Sun, 16 Mar 2014 23:18:33 +0200 |
| parents | f7c4736ffe90 |
| children | b973e8c7cf83 |
| files | CMakeModules/FindOGRE.cmake share/resources/gui_0.8/looknfeel/SWB.looknfeel share/resources/gui_0.8/looknfeel/SumWarsExtras.looknfeel share/resources/gui_0.8/looknfeel/TaharezLook.looknfeel |
| diffstat | 4 files changed, 60 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeModules/FindOGRE.cmake Fri Mar 14 21:11:04 2014 +0100 +++ b/CMakeModules/FindOGRE.cmake Sun Mar 16 23:18:33 2014 +0200 @@ -148,7 +148,7 @@ endif () # redo search if any of the environmental hints changed -set(OGRE_COMPONENTS Paging Terrain Volume Overlay +set(OGRE_COMPONENTS Paging Terrain Volume Overlay RTShaderSystem Plugin_BSPSceneManager Plugin_CgProgramManager Plugin_OctreeSceneManager Plugin_OctreeZone Plugin_PCZSceneManager Plugin_ParticleFX RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GL3Plus RenderSystem_GLES RenderSystem_GLES2) @@ -177,6 +177,9 @@ # locate Ogre include files find_path(OGRE_CONFIG_INCLUDE_DIR NAMES OgreBuildSettings.h HINTS ${OGRE_INC_SEARCH_PATH} ${OGRE_FRAMEWORK_INCLUDES} ${OGRE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE") +# Augustin Preda, 2014.03.16: Somehow, the latest change breaks the detection of the header files on Windows +# (if "OgreRoot.h" and "OgreBuildSettings.h" are in different directories) +Set (OGRE_INC_SEARCH_PATH ${OGRE_INC_SEARCH_PATH} ${ENV_OGRE_HOME}/OgreMain/include) find_path(OGRE_INCLUDE_DIR NAMES OgreRoot.h HINTS ${OGRE_CONFIG_INCLUDE_DIR} ${OGRE_INC_SEARCH_PATH} ${OGRE_FRAMEWORK_INCLUDES} ${OGRE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE") set(OGRE_INCOMPATIBLE FALSE)
--- a/share/resources/gui_0.8/looknfeel/SWB.looknfeel Fri Mar 14 21:11:04 2014 +0100 +++ b/share/resources/gui_0.8/looknfeel/SWB.looknfeel Sun Mar 16 23:18:33 2014 +0200 @@ -621,7 +621,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/PlainGray" /> + <Image name="SWB/PlainGray" /> <ColourRectProperty name="ImageColours" /> <VertFormat type="Stretched" /> <HorzFormat type="Stretched" /> @@ -785,6 +785,7 @@ <PropertyDefinition name="FrameColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" /> <!--<PropertyDefinition name="BackgroundColours" initialValue="tl:FF000000 tr:FF000000 bl:FF000000 br:FF000000" redrawOnWrite="true" />--> <PropertyDefinition name="BackgroundColour" initialValue="B2000000" redrawOnWrite="true" type="Colour" /> + <Property name="FrameEnabled" value="True" /> <Property name="BackgroundEnabled" value="True" /> @@ -986,12 +987,12 @@ *************************************************** --> <WidgetLook name="SWB/HorizontalScrollbarThumb"> - <Property name="HorzFree" value="True" /> <!-- Horizontal mouse drag --> - <PropertyDefinition name="GS_DarkerThemeColour" initialValue="FF940000" redrawOnWrite="true" /> <PropertyDefinition name="GS_LighterThemeColour" initialValue="FFFF0101" redrawOnWrite="true" /> <PropertyDefinition name="GS_MainThemeColour" initialValue="FFDC5F5F" redrawOnWrite="true" /> <PropertyDefinition name="GS_ShineColour" initialValue="B0FFFFFF" redrawOnWrite="true" /> + + <Property name="HorzFree" value="True" /> <!-- Horizontal mouse drag --> <ImagerySection name="border_section"> <FrameComponent> @@ -1031,7 +1032,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/HorzScrollThumb_Background" /> + <Image name="SWB/HorzScrollThumb_Background" /> <VertFormat type="Stretched" /> <HorzFormat type="Stretched" /> </ImageryComponent> @@ -1071,7 +1072,6 @@ <Layer> <Section section="background_section"> <ColourProperty name="GS_MainThemeColour" /> - <Colours topLeft="997F7F7F" topRight="997F7F7F" bottomLeft="997F7F7F" bottomRight="997F7F7F" /> </Section> </Layer> <Layer> @@ -1176,13 +1176,13 @@ *************************************************** --> <WidgetLook name="SWB/VerticalScrollbarThumb"> - <Property name="VertFree" value="True" /> - <PropertyDefinition name="GS_DarkerThemeColour" initialValue="FF940000" redrawOnWrite="true" /> <PropertyDefinition name="GS_LighterThemeColour" initialValue="FFFF0101" redrawOnWrite="true" /> <PropertyDefinition name="GS_MainThemeColour" initialValue="FFDC5F5F" redrawOnWrite="true" /> <PropertyDefinition name="GS_ShineColour" initialValue="B0FFFFFF" redrawOnWrite="true" /> + <Property name="VertFree" value="True" /> + <ImagerySection name="border_section"> <FrameComponent> <Area> @@ -1221,7 +1221,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/VertScrollThumb_Background" /> + <Image name="SWB/VertScrollThumb_Background" /> <VertFormat type="Stretched" /> <HorzFormat type="Stretched" /> </ImageryComponent> @@ -1460,7 +1460,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/MiniButton_Background" /> <!-- shared image from other item --> + <Image name="SWB/MiniButton_Background" /> <!-- shared image from other item --> <VertFormatProperty name="VertImageFormatting" /> <HorzFormatProperty name="HorzImageFormatting" /> </ImageryComponent> @@ -1484,7 +1484,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/MiniButton_BackgHighlight" /> <!-- shared image from other item --> + <Image name="SWB/MiniButton_BackgHighlight" /> <!-- shared image from other item --> <VertFormatProperty name="VertImageFormatting" /> <HorzFormatProperty name="HorzImageFormatting" /> </ImageryComponent> @@ -1589,7 +1589,9 @@ <PropertyDefinition name="DisabledTextColour" initialValue="FFDDDDDD" redrawOnWrite="true" type="Colour" /> <PropertyDefinition name="VertFormatting" initialValue="CentreAligned" redrawOnWrite="true" type="VerticalTextFormatting" /> <PropertyDefinition name="HorzFormatting" initialValue="CentreAligned" redrawOnWrite="true" type="HorizontalTextFormatting" /> + <Property name="Size" value="{{0, 128}, {0, 32}}" /> + <ImagerySection name="Label"> <TextComponent> <Area> @@ -2338,7 +2340,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/MiniButton_Background" /> <!-- shared image from other item --> + <Image name="SWB/MiniButton_Background" /> <!-- shared image from other item --> <VertFormatProperty name="VertImageFormatting" /> <HorzFormatProperty name="HorzImageFormatting" /> </ImageryComponent> @@ -2774,7 +2776,7 @@ </Dim> </Area> - <Image name="SWB/CheckboxMark" /> + <Image component="Background" name="SWB/CheckboxMark" /> </FrameComponent> </ImagerySection> @@ -3467,7 +3469,7 @@ </OperatorDim> </Dim> </Area> - <Image component="Background" name="SWB/TooltipMiddle" /> + <Image name="SWB/TooltipMiddle" /> <VertFormat type="Stretched" /> <HorzFormat type="Stretched" /> </ImageryComponent> @@ -3491,8 +3493,7 @@ </OperatorDim> </Dim> </Area> - <!--<Colours topLeft="FFFFE6DA" topRight="FFFFE6DA" bottomLeft="FFFFFBFA" bottomRight="FFFFFBFA" />--> - <Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />--> + <Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" /> <VertFormat type="CentreAligned" /> <HorzFormat type="CentreAligned" /> </TextComponent> @@ -4447,6 +4448,7 @@ <WidgetLook name="SWB/TabButtonPane"> <PropertyDefinition name="EnableTop" initialValue="1" redrawOnWrite="true" layoutOnWrite="true" /> <PropertyDefinition name="EnableBottom" initialValue="1" redrawOnWrite="true" layoutOnWrite="true" /> + <ImagerySection name="normal"> </ImagerySection> @@ -4471,10 +4473,12 @@ *************************************************** --> <WidgetLook name="SWB/TabControl"> + <PropertyDefinition name="TCScrollLRatio" initialValue="0.2" redrawOnWrite="true" /> <!-- The ratio is height / width --> +<!-- <PropertyDefinition name="TCScrollLRatio" initialValue="0.1" redrawOnWrite="true" layoutOnWrite="true" />--> + <Property name="TabButtonType" value="SWB/TabButton" /> <Property name="TabTextPadding" value="{0,6}" /> - <PropertyDefinition name="TCScrollLRatio" initialValue="0.2" redrawOnWrite="true" /> <!-- The ratio is height / width --> -<!-- <PropertyDefinition name="TCScrollLRatio" initialValue="0.1" redrawOnWrite="true" layoutOnWrite="true" />--> + <Child type="SWB/TabContentPane" nameSuffix="__auto_TabPane__"> <Area> <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim> @@ -4562,12 +4566,10 @@ </OperatorDim> </Dim> <Dim type="TopEdge"> - <WidgetDim widget="__auto_TabPane__Buttons" dimension="TopEdge"> - </WidgetDim> + <WidgetDim widget="__auto_TabPane__Buttons" dimension="TopEdge" /> </Dim> <Dim type="Height"> - <WidgetDim widget="__auto_TabPane__Buttons" dimension="Height"> - </WidgetDim> + <WidgetDim widget="__auto_TabPane__Buttons" dimension="Height" /> </Dim> </Area> <Property name="AlwaysOnTop" value="True" /> @@ -4586,12 +4588,12 @@ --> <WidgetLook name="SWB/Titlebar"> <PropertyDefinition name="CaptionColour" initialValue="FFFFFFFF" redrawOnWrite="true" /> - <Property name="NonClient" value="True" /> - <PropertyDefinition name="ActiveColour" initialValue="FFFF0000" redrawOnWrite="true"/> <PropertyDefinition name="InactiveColour" initialValue="FFEE1111" redrawOnWrite="true"/> <PropertyDefinition name="BackgroundPictureColour" initialValue="FFBBA075" redrawOnWrite="true"/> + <Property name="NonClient" value="True" /> + <ImagerySection name="overdrawn_section"> <FrameComponent> <Area> @@ -4711,17 +4713,18 @@ <WidgetLook name="SWB/FrameWindow"> <PropertyDefinition name="ClientAreaColour" initialValue="FFFFFFFF" redrawOnWrite="true" /> <PropertyDefinition name="TitlebarHeight" initialValue="95" redrawOnWrite="true" /> + <PropertyDefinition name="BackgroundPictureColour" initialValue="FFBBA075" redrawOnWrite="true"/> + <PropertyDefinition name="CloseButtonAlignment" initialValue="1" redrawOnWrite="true"/> + <PropertyLinkDefinition name="CaptionColour" widget="__auto_titlebar__" targetProperty="CaptionColour" initialValue="FFFFFFFF" /> <PropertyLinkDefinition name="TitlebarFont" widget="__auto_titlebar__" targetProperty="Font" /> + <Property name="NSSizingCursorImage" value="SWBCursors/MouseNoSoCursor" /> <Property name="EWSizingCursorImage" value="SWBCursors/MouseEsWeCursor" /> <Property name="NWSESizingCursorImage" value="SWBCursors/MouseNwSeCursor" /> <Property name="NESWSizingCursorImage" value="SWBCursors/MouseNeSwCursor" /> <Property name="MinSize" value="{{0.01,0},{0.01,0}}" /> <Property name="AutoRenderingSurface" value="True" /> - <!--<PropertyDefinition name="BackgroundPictureColour" initialValue="DFFFFFFF" redrawOnWrite="true"/>--> - <PropertyDefinition name="BackgroundPictureColour" initialValue="FFBBA075" redrawOnWrite="true"/> - <PropertyDefinition name="CloseButtonAlignment" initialValue="1" redrawOnWrite="true"/> <NamedArea name="ClientWithTitleWithFrame"> <Area> @@ -5074,8 +5077,7 @@ <Child type="DefaultWindow" nameSuffix="__auto_contentpane__"> <Area> <Dim type="LeftEdge"> - <AbsoluteDim value="8"> - </AbsoluteDim> + <AbsoluteDim value="8" /> </Dim> <Dim type="TopEdge"> <AbsoluteDim value="20" /> @@ -5224,7 +5226,6 @@ <PropertyDefinition name="BackgroundHighlightColour" initialValue="FFFFFFFF" /> <PropertyDefinition name="BorderColour" initialValue="FFBBA075" /> <PropertyDefinition name="BorderColourHover" initialValue="FFCCB078" /> - <ImagerySection name="border_section"> <FrameComponent>
--- a/share/resources/gui_0.8/looknfeel/SumWarsExtras.looknfeel Fri Mar 14 21:11:04 2014 +0100 +++ b/share/resources/gui_0.8/looknfeel/SumWarsExtras.looknfeel Sun Mar 16 23:18:33 2014 +0200 @@ -71,6 +71,17 @@ <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim> </Area> </NamedArea> + + <Child type="SumWarsExtras/HPProgressOrbHighlight" nameSuffix="__auto_orb_highlight__"> + <Area> + <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim> + <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim> + <Dim type="Width" ><UnifiedDim scale="1" offset="-10" type="Width" /></Dim> + <Dim type="Height" ><UnifiedDim scale="1" offset="-10" type="Height" /></Dim> + </Area> + <VertAlignment type="BottomAligned" /> + </Child> + <ImagerySection name="background"> <ImageryComponent> <Area> @@ -98,16 +109,6 @@ </ImageryComponent> </ImagerySection> - <Child type="SumWarsExtras/HPProgressOrbHighlight" nameSuffix="__auto_orb_highlight__"> - <Area> - <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim> - <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim> - <Dim type="Width" ><UnifiedDim scale="1" offset="-10" type="Width" /></Dim> - <Dim type="Height" ><UnifiedDim scale="1" offset="-10" type="Height" /></Dim> - </Area> - <VertAlignment type="BottomAligned" /> - </Child> - <StateImagery name="Enabled"> <Layer> <Section section="background"> @@ -222,9 +223,9 @@ <Dim type="Width" ><UnifiedDim scale="1.0" type="Width" /></Dim> <Dim type="Height" ><UnifiedDim scale="1.0" type="Height" /></Dim> </Area> - <Image type="LeftEdge" name="SumWarsExtras/MiniHorzScrollThumbLeftNormal" /> - <Image type="RightEdge" name="SumWarsExtras/MiniHorzScrollThumbRightNormal" /> - <Image type="Background" name="SumWarsExtras/MiniHorzScrollThumbMiddleNormal" /> + <Image component="LeftEdge" name="SumWarsExtras/MiniHorzScrollThumbLeftNormal" /> + <Image component="RightEdge" name="SumWarsExtras/MiniHorzScrollThumbRightNormal" /> + <Image component="Background" name="SumWarsExtras/MiniHorzScrollThumbMiddleNormal" /> </FrameComponent> </ImagerySection> <ImagerySection name="hover"> @@ -235,9 +236,9 @@ <Dim type="Width" ><UnifiedDim scale="1.0" type="Width" /></Dim> <Dim type="Height" ><UnifiedDim scale="1.0" type="Height" /></Dim> </Area> - <Image type="LeftEdge" name="SumWarsExtras/MiniHorzScrollThumbLeftHover" /> - <Image type="RightEdge" name="SumWarsExtras/MiniHorzScrollThumbRightHover" /> - <Image type="Background" name="SumWarsExtras/MiniHorzScrollThumbMiddleHover" /> + <Image component="LeftEdge" name="SumWarsExtras/MiniHorzScrollThumbLeftHover" /> + <Image component="RightEdge" name="SumWarsExtras/MiniHorzScrollThumbRightHover" /> + <Image component="Background" name="SumWarsExtras/MiniHorzScrollThumbMiddleHover" /> </FrameComponent> </ImagerySection> <StateImagery name="Normal"> @@ -362,9 +363,9 @@ <Dim type="Width" ><UnifiedDim scale="1.0" type="Width" /></Dim> <Dim type="Height" ><UnifiedDim scale="1.0" type="Height" /></Dim> </Area> - <Image type="TopEdge" name="SumWarsExtras/MiniVertScrollThumbTopNormal" /> - <Image type="BottomEdge" name="SumWarsExtras/MiniVertScrollThumbBottomNormal" /> - <Image type="Background" name="SumWarsExtras/MiniVertScrollThumbMiddleNormal" /> + <Image component="TopEdge" name="SumWarsExtras/MiniVertScrollThumbTopNormal" /> + <Image component="BottomEdge" name="SumWarsExtras/MiniVertScrollThumbBottomNormal" /> + <Image component="Background" name="SumWarsExtras/MiniVertScrollThumbMiddleNormal" /> </FrameComponent> </ImagerySection> <ImagerySection name="hover"> @@ -375,9 +376,9 @@ <Dim type="Width" ><UnifiedDim scale="1.0" type="Width" /></Dim> <Dim type="Height" ><UnifiedDim scale="1.0" type="Height" /></Dim> </Area> - <Image type="TopEdge" name="SumWarsExtras/MiniVertScrollThumbTopHover" /> - <Image type="BottomEdge" name="SumWarsExtras/MiniVertScrollThumbBottomHover" /> - <Image type="Background" name="SumWarsExtras/MiniVertScrollThumbMiddleHover" /> + <Image component="TopEdge" name="SumWarsExtras/MiniVertScrollThumbTopHover" /> + <Image component="BottomEdge" name="SumWarsExtras/MiniVertScrollThumbBottomHover" /> + <Image component="Background" name="SumWarsExtras/MiniVertScrollThumbMiddleHover" /> </FrameComponent> </ImagerySection> <StateImagery name="Normal"> @@ -501,6 +502,7 @@ <PropertyDefinition name="DisabledImage" initialValue="" redrawOnWrite="true" /> <PropertyDefinition name="VertImageFormatting" initialValue="Stretched" redrawOnWrite="true" /> <PropertyDefinition name="HorzImageFormatting" initialValue="Stretched" redrawOnWrite="true" /> + <ImagerySection name="normal"> <ImageryComponent> <Area>
--- a/share/resources/gui_0.8/looknfeel/TaharezLook.looknfeel Fri Mar 14 21:11:04 2014 +0100 +++ b/share/resources/gui_0.8/looknfeel/TaharezLook.looknfeel Sun Mar 16 23:18:33 2014 +0200 @@ -1951,7 +1951,7 @@ </Dim> </Area> <Image name="TaharezLook/StaticBackdrop" /> - <ColourRectProperty name="BackgroundColours" /> + <!--<ColourRectProperty name="BackgroundColours" />--> <Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" /> <VertFormat type="Stretched" /> <HorzFormat type="Stretched" /> @@ -1960,7 +1960,7 @@ <ImagerySection name="background_noframe"> <ImageryComponent> <Image name="TaharezLook/StaticBackdrop" /> - <ColourRectProperty name="BackgroundColours" /> + <!--<ColourRectProperty name="BackgroundColours" />--> <Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" /> <VertFormat type="Stretched" /> <HorzFormat type="Stretched" />