Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/ogre1.9

  • code/branches/ogre1.9/data/gui/layouts/DecisionPopup.layout

    r6746 r11211  
    1 <?xml version="1.0" encoding="UTF-8"?>
    2 
    3 <GUILayout >
    4     <Window Type="DefaultWindow" Name="orxonox/DecisionPopup_RootWindow" >
    5         <Property Name="InheritsAlpha" Value="False" />
    6         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    7         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="MenuWidgets/StaticImage" Name="orxonox/DecisionPopup_Background" >
    9             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    10             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    11             <Property Name="Alpha" Value="0.6" />
    12             <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_yes" >
    13                 <Property Name="Text" Value="Yes" />
    14                 <Property Name="Alpha" Value="0.7" />
    15                 <Property Name="InheritsAlpha" Value="False" />
    16                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    17                 <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
    18                 <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
     1<?xml version='1.0' encoding='utf-8'?>
     2<GUILayout version="4">
     3    <Window name="DecisionPopup_RootWindow" type="DefaultWindow">
     4        <Property name="InheritsAlpha" value="False" />
     5        <Property name="MaxSize" value="{{1,0},{1,0}}" />
     6        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
     7        <Window name="DecisionPopup_Background" type="MenuWidgets/StaticImage">
     8            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     9            <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
     10            <Property name="Alpha" value="0.6" />
     11            <Window name="DecisionPopup_button_yes" type="MenuWidgets/Button">
     12                <Property name="Text" value="Yes" />
     13                <Property name="Alpha" value="0.7" />
     14                <Property name="InheritsAlpha" value="False" />
     15                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     16                <Property name="Area" value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
     17                <Event function="DecisionPopup.button_yes" name="Clicked" />
    1918            </Window>
    20             <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_no" >
    21                 <Property Name="Text" Value="No" />
    22                 <Property Name="Alpha" Value="0.8" />
    23                 <Property Name="InheritsAlpha" Value="False" />
    24                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    25                 <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
    26                 <Event Name="Clicked" Function="DecisionPopup.button_no"/>
     19            <Window name="DecisionPopup_button_no" type="MenuWidgets/Button">
     20                <Property name="Text" value="No" />
     21                <Property name="Alpha" value="0.8" />
     22                <Property name="InheritsAlpha" value="False" />
     23                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     24                <Property name="Area" value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
     25                <Event function="DecisionPopup.button_no" name="Clicked" />
    2726            </Window>
    28             <Window Type="MenuWidgets/StaticText" Name="orxonox/DecisionPopup_text" >
    29                 <Property Name="Text" Value="Template text" />
    30                 <Property Name="HorzFormatting" Value="WordWrapCentred" />
    31                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    32                 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
    33                 <Property Name="InheritsAlpha" Value="False" />
    34                 <Property Name="Alpha" Value="0.8" />
     27            <Window name="DecisionPopup_text" type="MenuWidgets/StaticText">
     28                <Property name="Text" value="Template text" />
     29                <Property name="HorzFormatting" value="WordWrapCentred" />
     30                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     31                <Property name="Area" value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
     32                <Property name="InheritsAlpha" value="False" />
     33                <Property name="Alpha" value="0.8" />
    3534            </Window>
    3635        </Window>
Note: See TracChangeset for help on using the changeset viewer.