[Orxonox-commit 7184] r11801 - in code/branches/cegui0.8_ogre1.9/data/gui: layouts scripts

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-24 01:08:11 +0100 (Sat, 24 Feb 2018)
New Revision: 11801

Removed:
   code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenuBackground.layout
Modified:
   code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout
   code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout
   code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout
   code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerConfigMenu.lua
Log:
fixed some config values; removed unused layout; renamed some background windows; removed unknown property

Modified: code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout	2018-02-24 00:05:32 UTC (rev 11800)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout	2018-02-24 00:08:11 UTC (rev 11801)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Background" type="DefaultWindow">
+    <Window name="CreditsBackground" 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}}" />

Modified: code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout	2018-02-24 00:05:32 UTC (rev 11800)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout	2018-02-24 00:08:11 UTC (rev 11801)
@@ -51,7 +51,6 @@
                     <Property name="AlwaysOnTop" value="True" />
                     <Property name="MaxSize" value="{{1,0},{1,0}}" />
                     <Property name="Area" value="{{0.05,0},{0.21,0},{0.95,0},{0.9,0}}" />
-                    <Property name="MaxEditTextLength" value="1073741823" />
                     <Property name="ReadOnly" value="True" />
                     <Event function="GameplayMenu.GameplayThemeCombobox_changed" name="ListSelectionAccepted" />
                 </Window>

Deleted: code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenuBackground.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenuBackground.layout	2018-02-24 00:05:32 UTC (rev 11800)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenuBackground.layout	2018-02-24 00:08:11 UTC (rev 11801)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<GUILayout version="4">
-    <Window name="Background" type="MenuWidgets/StaticImage">
-        <Property name="Size" value="{{1.0,0},{1.0,0}}" />
-        <Property name="Image" value="MainMenuBackground/Background" />
-        <Property name="FrameEnabled" value="set:true" />
-        <Property name="BackgroundEnabled" value="set:false" />
-        <Property name="InheritsAlpha" value="False" />
-    </Window>
-</GUILayout>
\ No newline at end of file

Modified: code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout	2018-02-24 00:05:32 UTC (rev 11800)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout	2018-02-24 00:08:11 UTC (rev 11801)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Background" type="MenuWidgets/StaticImage">
+    <Window name="SingleplayerConfigBackground" type="MenuWidgets/StaticImage">
         <Property name="FrameEnabled" value="False" />
         <Property name="InheritsAlpha" value="False" />
         <Property name="MaxSize" value="{{1,0},{1,0}}" />

Modified: code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerConfigMenu.lua
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerConfigMenu.lua	2018-02-24 00:05:32 UTC (rev 11800)
+++ code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerConfigMenu.lua	2018-02-24 00:08:11 UTC (rev 11801)
@@ -45,7 +45,7 @@
     table.insert(P.commandList, "LastTeamStanding respawnDelay")
     table.insert(P.commandList, "LastTeamStanding bNoPunishment")
     table.insert(P.commandList, "LastTeamStanding bHardPunishment")
-    table.insert(P.commandList, "TeamDeathmatch teams_")
+    table.insert(P.commandList, "TeamGametype teams_")
     table.insert(P.commandList, "UnderAttack gameTime_")
 
     P.nameList = {}
@@ -63,7 +63,7 @@
     table.insert(P.nameList, "LastTeamStanding: respawn delay")
     table.insert(P.nameList, "LastTeamStanding: no punishment")
     table.insert(P.nameList, "LastTeamStanding: hard punishment")
-    table.insert(P.nameList, "TeamDeathmatch: Number of teams")
+    table.insert(P.nameList, "TeamGametype: Number of teams")
     table.insert(P.nameList, "UnderAttack: game time")
 
     P.linesList = {}