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

    r9348 r11211  
    1 <?xml version="1.0" encoding="UTF-8"?>
    2 
    3 <GUILayout >
    4 
    5     <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionBackground" >
    6         <Property Name="FrameEnabled" Value="False" />
    7         <Property Name="InheritsAlpha" Value="False" />
    8         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    9         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    10         <Property Name="BackgroundEnabled" Value="False" />
    11         <!-- -->
    12         <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionWindow" >
    13             <Property Name="Text" Value="ShipSelection" />
    14             <Property Name="Alpha" Value="0.8" />
    15             <Property Name="InheritsAlpha" Value="False" />
    16             <Property Name="HorzFormatting" Value="HorzCentred" />
    17             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    18             <Property Name="VertFormatting" Value="TopAligned" />
    19             <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
    20             <Window Type="MenuWidgets/TabControl" Name="orxonox/ShipSelectionTabControl" >
    21                 <Property Name="TabHeight" Value="{0,26.4388}" />
    22                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    23                 <Property Name="TabPanePosition" Value="Top" />
    24                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
    25 
     1<?xml version='1.0' encoding='utf-8'?>
     2<GUILayout version="4">
     3    <Window name="ShipSelectionBackground" type="MenuWidgets/StaticImage">
     4        <Property name="FrameEnabled" value="False" />
     5        <Property name="InheritsAlpha" value="False" />
     6        <Property name="MaxSize" value="{{1,0},{1,0}}" />
     7        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
     8        <Property name="BackgroundEnabled" value="False" />
     9        <Window name="ShipSelectionWindow" type="MenuWidgets/StaticText">
     10            <Property name="Text" value="ShipSelection" />
     11            <Property name="Alpha" value="0.8" />
     12            <Property name="InheritsAlpha" value="False" />
     13            <Property name="HorzFormatting" value="HorzCentred" />
     14            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     15            <Property name="VertFormatting" value="TopAligned" />
     16            <Property name="Area" value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
     17            <Window name="ShipSelectionTabControl" type="MenuWidgets/TabControl">
     18                <Property name="TabHeight" value="{0,26.4388}" />
     19                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     20                <Property name="TabPanePosition" value="Top" />
     21                <Property name="Area" value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
    2622            </Window>
    27 
    28             <!-- TODO: Ship Description and Image
    29             <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionShipImage" >
    30                 <Property Name="AlwaysOnTop" Value="True" />
    31                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    32                 <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
    33             </Window>
    34             <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionLevelDescription" >
    35                 <Property Name="AlwaysOnTop" Value="True" />
    36                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37                 <Property Name="VertScrollbar" Value="True" />
    38                 <Property Name="HorzScrollbar" Value="True" />
    39                 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
    40             </Window>-->
    41 
    4223        </Window>
    43         <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionStartButton" >
    44             <Property Name="Text" Value="Start" />
    45             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    46             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
    47             <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionStartButton_clicked"/>
     24        <Window name="ShipSelectionStartButton" type="MenuWidgets/Button">
     25            <Property name="Text" value="Start" />
     26            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     27            <Property name="Area" value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
     28            <Event function="ShipSelectionMenu.ShipSelectionStartButton_clicked" name="Clicked" />
    4829        </Window>
    49         <!-- TODO: set ship properties
    50         <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionConfigButton" >
    51             <Property Name="Text" Value="Configure" />
    52             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    53             <Property Name="UnifiedAreaRect" Value="{{0.425,0},{0.725,0},{0.575,0},{0.775,0}}" />
    54             <Property Name="Disabled" Value="True" />
    55             <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionConfigButton_clicked"/>
    56         </Window> -->
    57         <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionBackButton" >
    58             <Property Name="Text" Value="Back" />
    59             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    60             <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
    61             <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionBackButton_clicked"/>
     30        <Window name="ShipSelectionBackButton" type="MenuWidgets/Button">
     31            <Property name="Text" value="Back" />
     32            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     33            <Property name="Area" value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
     34            <Event function="ShipSelectionMenu.ShipSelectionBackButton_clicked" name="Clicked" />
    6235        </Window>
    6336    </Window>
Note: See TracChangeset for help on using the changeset viewer.