[Orxonox-commit 6678] r11308 - in code/branches/StoryModeMap_HS16/data/gui: layouts schemes
marvinh at orxonox.net
marvinh at orxonox.net
Mon Nov 28 16:00:23 CET 2016
Author: marvinh
Date: 2016-11-28 16:00:23 +0100 (Mon, 28 Nov 2016)
New Revision: 11308
Modified:
code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout
code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme
code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme
code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme
Log:
Ein neuer Button wurde kreiert. Der JuuButton funktioniert nicht schlecht. Mit dem orxonox looknfeel und dem imageset wird er kreiert und gestaltet. Es braucht noch die richtige Formatierung, dass er richtig skaliert. Zudem muss der Text irgendwo noch erscheinen. entweder in einem anderen Button oder im selben. Studie des CEGUI waere hilfreich. Zudem muss der Diabled State noch machen, welcher die Planeten dunkler macht, dass man sieht welches Level schon gespielt wurde.
Modified: code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout 2016-11-28 14:34:58 UTC (rev 11307)
+++ code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout 2016-11-28 15:00:23 UTC (rev 11308)
@@ -7,14 +7,14 @@
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
<Property Name="BackgroundEnabled" Value="False" />
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission1Button" >
<Property Name="Text" Value="Mission One" />
<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}}" />
<Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
<Property Name="Text" Value="Fight in our Back" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22,7 +22,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/ImageButton" Name="orxonox/Mission3Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
<Property Name="Text" Value="Pirate Attack" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -30,7 +30,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
<Property Name="Text" Value="Trip to Area 51" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -38,7 +38,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
<Property Name="Text" Value="Area 51 under Fire" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -46,7 +46,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
<Property Name="Text" Value="Escape the Bastards" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -54,7 +54,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission7Button" >
<Property Name="Text" Value="Expedition to Sector 5C" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -62,7 +62,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission8Button" >
<Property Name="Text" Value="Shuttle under Attack" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -70,7 +70,7 @@
<Property Name="Disabled" Value="True" />
<Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
</Window>
- <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
+ <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission9Button" >
<Property Name="Text" Value="Retaliation" />
<Property Name="Visible" Value="False"/>
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme 2016-11-28 14:34:58 UTC (rev 11307)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme 2016-11-28 15:00:23 UTC (rev 11308)
@@ -39,4 +39,6 @@
<WindowAlias Alias="HUDWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
<WindowAlias Alias="HUDWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
<WindowAlias Alias="HUDWidgets/Tree" Target="OrxonoxLook/Tree" />
+
+ <WindowAlias Alias="HUDWidgets/JuuButton" Target="OrxonoxLook/JuuButton" />
</GUIScheme>
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme 2016-11-28 14:34:58 UTC (rev 11307)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme 2016-11-28 15:00:23 UTC (rev 11308)
@@ -49,5 +49,8 @@
<FalagardMapping WindowType="OrxonoxLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="OrxonoxLook/AltProgressBar" />
<FalagardMapping WindowType="OrxonoxLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="OrxonoxLook/VUMeter" />
<FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="OrxonoxLook/LargeVerticalScrollbar" />
- <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
+ <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
+
+ <FalagardMapping WindowType="OrxonoxLook/JuuButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="OrxonoxLook/JuuButton" />
+
</GUIScheme>
Modified: code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme 2016-11-28 14:34:58 UTC (rev 11307)
+++ code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme 2016-11-28 15:00:23 UTC (rev 11308)
@@ -39,4 +39,6 @@
<WindowAlias Alias="MenuWidgets/Titlebar" Target="OrxonoxLook/Titlebar" />
<WindowAlias Alias="MenuWidgets/Tooltip" Target="OrxonoxLook/Tooltip" />
<WindowAlias Alias="MenuWidgets/Tree" Target="OrxonoxLook/Tree" />
+
+ <WindowAlias Alias="MenuWidgets/JuuButton" Target="OrxonoxLook/JuuButton" />
</GUIScheme>
More information about the Orxonox-commit
mailing list