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/PickupInventory.layout

    r6746 r11211  
    1 <?xml version="1.0" encoding="UTF-8"?>
    2 
    3 <GUILayout >
    4     <Window Type="DefaultWindow" Name="orxonox/PickupInventory/Background" >
    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/StaticText" Name="orxonox/PickupInventory/PickupInventory" >
    9             <Property Name="Text" Value="Pickup Inventory" />
    10             <Property Name="Alpha" Value="0.8" />
    11             <Property Name="InheritsAlpha" Value="False" />
    12             <Property Name="HorzFormatting" Value="HorzCentred" />
    13             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    14             <Property Name="VertFormatting" Value="TopAligned" />
    15             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
    16             <Window Type="MenuWidgets/StaticText" Name="orxonox/PickupInventory/Wrapper" >
    17                 <Property Name="TextColours" Value="FF4444FF" />
    18                 <Property Name="InheritsAlpha" Value="False" />
    19                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    20                 <Property Name="HorzFormatting" Value="HorzCentred" />
    21                 <Property Name="VertFormatting" Value="TopAligned" />
    22                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
    23                 <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/PickupInventory/Inventory" >
    24                     <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
    25                     <Property Name="HorzStepSize" Value="0.005" />
    26                     <Property Name="VertStepSize" Value="0.005" />
    27                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    28                     <Property Name="HorzOverlapSize" Value="0.01" />
    29                     <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
    30                     <Property Name="VertOverlapSize" Value="0.01" />
    31                     <Property Name="HorzScrollPosition" Value="0" />
    32                     <Property Name="VertScrollPosition" Value="0" />
     1<?xml version='1.0' encoding='utf-8'?>
     2<GUILayout version="4">
     3    <Window name="Background" 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="PickupInventory" type="MenuWidgets/StaticText">
     8            <Property name="Text" value="Pickup Inventory" />
     9            <Property name="Alpha" value="0.8" />
     10            <Property name="InheritsAlpha" value="False" />
     11            <Property name="HorzFormatting" value="HorzCentred" />
     12            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     13            <Property name="VertFormatting" value="TopAligned" />
     14            <Property name="Area" value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
     15            <Window name="Wrapper" type="MenuWidgets/StaticText">
     16                <Property name="TextColours" value="FF4444FF" />
     17                <Property name="InheritsAlpha" value="False" />
     18                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     19                <Property name="HorzFormatting" value="HorzCentred" />
     20                <Property name="VertFormatting" value="TopAligned" />
     21                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
     22                <Window name="Inventory" type="MenuWidgets/ScrollablePane">
     23                    <Property name="ContentArea" value="l:0 t:0 r:0 b:0" />
     24                    <Property name="HorzStepSize" value="0.005" />
     25                    <Property name="VertStepSize" value="0.005" />
     26                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
     27                    <Property name="HorzOverlapSize" value="0.01" />
     28                    <Property name="Area" value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
     29                    <Property name="VertOverlapSize" value="0.01" />
     30                    <Property name="HorzScrollPosition" value="0" />
     31                    <Property name="VertScrollPosition" value="0" />
    3332                </Window>
    3433            </Window>
    3534        </Window>
    36         <Window Type="MenuWidgets/Button" Name="orxonox/PickupInventory/InventoryBackButton" >
    37             <Property Name="Text" Value="Back" />
    38             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    39             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8350,0},{0.6,0},{0.8800,0}}" />
    40             <Event Name="Clicked" Function="PickupInventory.InventoryBackButton_clicked"/>
     35        <Window name="InventoryBackButton" type="MenuWidgets/Button">
     36            <Property name="Text" value="Back" />
     37            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     38            <Property name="Area" value="{{0.4,0},{0.8350,0},{0.6,0},{0.8800,0}}" />
     39            <Event function="PickupInventory.InventoryBackButton_clicked" name="Clicked" />
    4140        </Window>
    4241    </Window>
Note: See TracChangeset for help on using the changeset viewer.