[Orxonox-commit 6701] r11330 - in code/branches/StoryModeMap_HS16/data/gui: layouts schemes
marvinh at orxonox.net
marvinh at orxonox.net
Mon Dec 12 15:04:10 CET 2016
Author: marvinh
Date: 2016-12-12 15:04:10 +0100 (Mon, 12 Dec 2016)
New Revision: 11330
Modified:
code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout
code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme
code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme
code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenLook.scheme
code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme
code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezLook.scheme
Log:
Finale Version. Die Buttons sind unsichtbar und darueber ist ein TextButton. Sachen von Data_extern muessen noch geschickt werden
Modified: code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout 2016-12-12 13:33:49 UTC (rev 11329)
+++ code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout 2016-12-12 14:04:10 UTC (rev 11330)
@@ -9,13 +9,14 @@
<Property Name="BackgroundEnabled" Value="False" />
<!-- Misson 1************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission1Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Text" >
<Property Name="Text" Value="Mission One" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission1Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
@@ -23,13 +24,15 @@
</Window>
<!-- Misson 2************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission2Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Text" >
<Property Name="Text" Value="Fight in our Back" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
@@ -38,12 +41,14 @@
</Window>
<!-- Misson 3************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission3Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Text" >
<Property Name="Text" Value="Pirate Attack" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.75,0},{0.8,0},{0.8,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -53,12 +58,14 @@
</Window>
<!-- Misson 4************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission4Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Text" >
<Property Name="Text" Value="Trip to Area 51" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedAreaRect" Value="{{0.575,0},{0.5,0},{0.775,0},{0.55,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -68,12 +75,14 @@
</Window>
<!-- Misson 5************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission5Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Text" >
<Property Name="Text" Value="Area 51 under Fire" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedAreaRect" Value="{{0.625,0},{0.4,0},{0.825,0},{0.45,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -83,12 +92,14 @@
</Window>
<!-- Misson 6************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission6Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Text" >
<Property Name="Text" Value="Escape the Bastards" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.1,0},{0.725,0},{0.15,0}}" />
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -98,12 +109,14 @@
</Window>
<!-- Misson 7************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission7Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Text" >
<Property Name="Text" Value="Expedition to Sector 5C" />
<Property Name="Visible" Value="False"/>
+ <Property Name="Disabled" Value="True" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission7Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -113,12 +126,14 @@
</Window>
<!-- Misson 8************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission8Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Text" >
<Property Name="Text" Value="Shuttle under Attack" />
<Property Name="Visible" Value="False"/>
+ <Property Name="Disabled" Value="True" />
<Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.45,0},{0.25,0}}" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission8Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -128,12 +143,14 @@
</Window>
<!-- Misson 9************************************* -->
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission9Text" >
+ <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Text" >
<Property Name="Text" Value="Retaliation" />
<Property Name="Visible" Value="False"/>
+ <Property Name="Disabled" Value="True" />
<Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.145,0},{0.3,0},{0.195,0}}" />
+ <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission9Button" >
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme 2016-12-12 13:33:49 UTC (rev 11329)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme 2016-12-12 14:04:10 UTC (rev 11330)
@@ -40,5 +40,5 @@
<WindowAlias Alias="MenuWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
<WindowAlias Alias="MenuWidgets/Tree" Target="OrxonoxLook/Tree" />
- <WindowAlias Alias="MenuWidgets/JuuButton" Target="OrxonoxLook/JuuButton" />
+ <WindowAlias Alias="MenuWidgets/JuuButton" Target="OrxonoxLook/JuuButton" />
</GUIScheme>
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme 2016-12-12 13:33:49 UTC (rev 11329)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme 2016-12-12 14:04:10 UTC (rev 11330)
@@ -39,4 +39,6 @@
<WindowAlias Alias="HUDWidgets/Titlebar" Target="TaharezGreenLook/Titlebar" />
<WindowAlias Alias="HUDWidgets/Tooltip" Target="TaharezGreenLook/Tooltip" />
<WindowAlias Alias="HUDWidgets/Tree" Target="TaharezGreenLook/Tree" />
+
+ <WindowAlias Alias="HUDWidgets/ImageButton" Target="TaharezGreenLook/JuuButton" />
</GUIScheme>
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenLook.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenLook.scheme 2016-12-12 13:33:49 UTC (rev 11329)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenLook.scheme 2016-12-12 14:04:10 UTC (rev 11330)
@@ -50,4 +50,7 @@
<FalagardMapping WindowType="TaharezGreenLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezGreenLook/VUMeter" />
<FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezGreenLook/LargeVerticalScrollbar" />
<FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezGreenLook/LargeVerticalScrollbarThumb" />
+
+ <!-- Special Button for CampaignMenu -->
+ <FalagardMapping WindowType="TaharezGreenLook/JuuButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="TaharezGreenLook/JuuButton" />
</GUIScheme>
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme 2016-12-12 13:33:49 UTC (rev 11329)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme 2016-12-12 14:04:10 UTC (rev 11330)
@@ -39,4 +39,6 @@
<WindowAlias Alias="MenuWidgets/Titlebar" Target="TaharezGreenLook/Titlebar" />
<WindowAlias Alias="MenuWidgets/Tooltip" Target="TaharezGreenLook/Tooltip" />
<WindowAlias Alias="MenuWidgets/Tree" Target="TaharezGreenLook/Tree" />
+
+ <WindowAlias Alias="MenuWidgets/JuuButton" Target="TaharezGreenLook/JuuButton" />
</GUIScheme>
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezLook.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezLook.scheme 2016-12-12 13:33:49 UTC (rev 11329)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezLook.scheme 2016-12-12 14:04:10 UTC (rev 11330)
@@ -50,4 +50,5 @@
<FalagardMapping WindowType="TaharezLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
+
</GUIScheme>
More information about the Orxonox-commit
mailing list