Changeset 11211 for code/branches/ogre1.9/data/gui/layouts/InfoPopup.layout

Timestamp:

Jul 5, 2016, 11:46:10 PM (8 years ago)

Author:

bknecht

Message:

Merging cegui0.8 branch into ogre1.9 branch

Location:

code/branches/ogre1.9

Files:

• . (modified) (1 prop)
• data/gui/layouts/InfoPopup.layout (modified) (1 diff)

code/branches/ogre1.9/data/gui/layouts/InfoPopup.layout

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/InfoPopup_RootWindow" >
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="MenuWidgets/StaticImage" Name="orxonox/InfoPopup_Background" >
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-            <Property Name="Alpha" Value="0.7" />
-            <Window Type="MenuWidgets/Button" Name="orxonox/InfoPopup_close" >
-                <Property Name="Text" Value="Close" />
-                <Property Name="Alpha" Value="0.7" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
-                <Event Name="Clicked" Function="InfoPopup.close"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="InfoPopup_RootWindow" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="InfoPopup_Background" type="MenuWidgets/StaticImage">
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+            <Property name="Alpha" value="0.7" />
+            <Window name="InfoPopup_close" type="MenuWidgets/Button">
+                <Property name="Text" value="Close" />
+                <Property name="Alpha" value="0.7" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
+                <Event function="InfoPopup.close" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/InfoPopup_text" >
-                <Property Name="Text" Value="Template text" />
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
-                <Property Name="InheritsAlpha" Value="False" />
-               <Property Name="Alpha" Value="0.8" />
+            <Window name="InfoPopup_text" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Template text" />
+                <Property name="TextColours" value="FF4444FF" />
+                <Property name="HorzFormatting" value="WordWrapCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="Alpha" value="0.8" />
             </Window>
         </Window>