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

    r9348 r11211  
    1 <?xml version="1.0" encoding="UTF-8"?>
    2 
    3 <GUILayout>
    4     <Window Type="DefaultWindow" Name="orxonox/InGamePickupHUD_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="TaharezLook/StaticImage" Name="orxonox/InGamePickupHUD_Overview" >
    9             <Property Name="Font" Value="BlueHighway-12" />
    10             <Property Name="Text" Value="Pickup List" />
    11             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    12             <Property Name="UnifiedAreaRect" Value="{{0,5},{0.15,0},{0.2,0},{0.45,0}}" />
    13             <Property Name="Alpha" Value="0.3" />
    14             <!--Event Name="Clicked" Function="InGameMenu.button_return_clicked"/-->
    15             <Window Type="TaharezLook/StaticText" Name="orxonox/InGamePickupHUD_PickupTitle" >
    16                 <Property Name="Alpha" Value="0.8"/>
    17                 <Property Name="Text" Value="Pickup List" />
    18                 <Property Name="Font" Value="BlueHighway-10" />
    19                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    20                 <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,-20},{0,20}}" />
     1<?xml version='1.0' encoding='utf-8'?>
     2<GUILayout version="4">
     3    <Window name="InGamePickupHUD_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="InGamePickupHUD_Overview" type="TaharezLook/StaticImage">
     8            <Property name="Font" value="BlueHighway-12" />
     9            <Property name="Text" value="Pickup List" />
     10            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     11            <Property name="Area" value="{{0,5},{0.15,0},{0.2,0},{0.45,0}}" />
     12            <Property name="Alpha" value="0.3" />
     13            <Window name="InGamePickupHUD_PickupTitle" type="TaharezLook/StaticText">
     14                <Property name="Alpha" value="0.8" />
     15                <Property name="Text" value="Pickup List" />
     16                <Property name="Font" value="BlueHighway-10" />
     17                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     18                <Property name="Area" value="{{0,0},{0,0},{1,-20},{0,20}}" />
    2119            </Window>
    22             <Window Type="TaharezLook/Button" Name="orxonox/InGamePickupHUD_closeButton" >
    23                 <Property Name="Alpha" Value="0.8" />
    24                 <Property Name="Font" Value="BlueHighway-12" />
    25                 <Property Name="Text" Value="X" />
    26                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    27                 <Property Name="UnifiedAreaRect" Value="{{1,-20},{0,0},{1,0},{0,20}}" />
    28                 <!-- alle Grössen / anordnungen angepasst - da überschneidungen von absoluten
    29                 und relativen Positionsangaben (problematisch bei kleinen auflösungen) -->
    30                 <Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
     20            <Window name="InGamePickupHUD_closeButton" type="TaharezLook/Button">
     21                <Property name="Alpha" value="0.8" />
     22                <Property name="Font" value="BlueHighway-12" />
     23                <Property name="Text" value="X" />
     24                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     25                <Property name="Area" value="{{1,-20},{0,0},{1,0},{0,20}}" />
     26                <Event function="InGamePickupHUD.close_button_clicked" name="Clicked" />
    3127            </Window>
    32             <Window Type="TaharezLook/Listbox" Name="orxonox/InGamePickupHUD_PickupListBox">
    33                 <Property Name="Alpha" Value="0.8" />
    34                 <Property Name="Font" Value="BlueHighway-12" />
    35                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    36                 <Property Name="UnifiedAreaRect" Value="{{0,5},{0,25},{1,-5},{1,-5}}" />
    37                 <!--
    38                 <Window Type="TaharezLook/ListboxItem" Name="orxonox/InGamePickupHUD_TestPickupOne">
    39                     <Property Name="Alpha" Value="0.8" />
    40                     <Property Name="Font" Value="BlueHighway-12" />
    41                     <Property Name="Text" Value="First Pickup" />
    42                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    43                     <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0,30},{1,0}}" />
    44                 </Window>
    45                 -->
     28            <Window name="InGamePickupHUD_PickupListBox" type="TaharezLook/Listbox">
     29                <Property name="Alpha" value="0.8" />
     30                <Property name="Font" value="BlueHighway-12" />
     31                <Property name="MaxSize" value="{{1,0},{1,0}}" />
     32                <Property name="Area" value="{{0,5},{0,25},{1,-5},{1,-5}}" />
    4633            </Window>
    4734        </Window>
Note: See TracChangeset for help on using the changeset viewer.