[Orxonox-commit 3085] r7779 - in code/branches/presentation/data/gui: layouts scripts
konrad at orxonox.net
konrad at orxonox.net
Sun Dec 19 19:37:18 CET 2010
Author: konrad
Date: 2010-12-19 19:37:18 +0100 (Sun, 19 Dec 2010)
New Revision: 7779
Modified:
code/branches/presentation/data/gui/layouts/AudioMenu.layout
code/branches/presentation/data/gui/layouts/CreditsMenu.layout
code/branches/presentation/data/gui/layouts/GraphicsMenu.layout
code/branches/presentation/data/gui/scripts/GraphicsMenu.lua
Log:
Final changes to menu
Modified: code/branches/presentation/data/gui/layouts/AudioMenu.layout
===================================================================
--- code/branches/presentation/data/gui/layouts/AudioMenu.layout 2010-12-19 13:29:44 UTC (rev 7778)
+++ code/branches/presentation/data/gui/layouts/AudioMenu.layout 2010-12-19 18:37:18 UTC (rev 7779)
@@ -112,7 +112,7 @@
<Window Type="MenuWidgets/StaticText" Name="orxonox/AudioInfo" >
<Property Name="Text" >Theme changes might take
up to a minute.</Property>
- <Property Name="TextColours" Value="FF4444FF" />
+ <Property Name="TextColours" Value="FFFFFFFF" />
<Property Name="InheritsAlpha" Value="False" />
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Modified: code/branches/presentation/data/gui/layouts/CreditsMenu.layout
===================================================================
--- code/branches/presentation/data/gui/layouts/CreditsMenu.layout 2010-12-19 13:29:44 UTC (rev 7778)
+++ code/branches/presentation/data/gui/layouts/CreditsMenu.layout 2010-12-19 18:37:18 UTC (rev 7779)
@@ -31,28 +31,21 @@
<Property Name="HorzScrollPosition" Value="0" />
<Property Name="VertScrollPosition" Value="0" />
<Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
- <Property Name="TextColours" Value="FF4444FF" />
+ <Property Name="TextColours" Value="FFFFFFFF" />
<Property Name="InheritsAlpha" Value="False" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="VertFormatting" Value="TopAligned" />
<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
- <Property Name="Text">Orxonox version 0.0.3
+ <Property Name="Text">wird sowieso nicht gelesen
+Orxonox version 0.0.3
Programming Language: C++ - lua - tcl
Environment: OpenAL - Ogre - OIS - CEGUI - enet - ODE
Licence: GNU General Public Licence - Creative Commons
http://www.orxonox.net
-n
-n
-n
-n
-n
-n
-n
-n
-n </Property>
+ </Property>
</Window>
</Window>
</Window>
Modified: code/branches/presentation/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- code/branches/presentation/data/gui/layouts/GraphicsMenu.layout 2010-12-19 13:29:44 UTC (rev 7778)
+++ code/branches/presentation/data/gui/layouts/GraphicsMenu.layout 2010-12-19 18:37:18 UTC (rev 7779)
@@ -14,27 +14,40 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.75,0},{0.6375,0}}" />
<Window Type="MenuWidgets/StaticText" Name="orxonox/Resolution" >
<Property Name="Text" Value="Resolution" />
<Property Name="InheritsAlpha" Value="False" />
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.475,0},{0.92,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.10,0},{0.475,0},{0.65,0}}" />
<Window Type="MenuWidgets/Listbox" Name="orxonox/ResolutionListbox" >
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.95,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.95,0}}" />
<Event Name="ItemSelectionChanged" Function="GraphicsMenu.GraphicsResolutionListbox_changed"/>
</Window>
</Window>
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/Themes" >
+ <Property Name="Text" Value="Themes" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="VertFormatting" Value="TopAligned" />
+ <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.10,0},{0.95,0},{0.35,0}}" />
+ <Window Type="MenuWidgets/Listbox" Name="orxonox/ThemeDropBox" >
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.3,0},{0.95,0},{0.95,0}" />
+ <Event Name="ItemSelectionChanged" Function="GraphicsMenu.ThemeDropBox_changed"/>
+ </Window>
+ </Window>
<Window Type="MenuWidgets/StaticText" Name="orxonox/Brightness" >
<Property Name="Text" Value="Brightness" />
<Property Name="InheritsAlpha" Value="False" />
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.15,0},{0.95,0},{0.35,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.70,0},{0.475,0},{0.85,0}}" />
<Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
<Property Name="Disabled" Value="true" />
<Property Name="PageSize" Value="0" />
@@ -52,7 +65,7 @@
<Window Type="MenuWidgets/Checkbox" Name="orxonox/FullscreenCheckbox" >
<Property Name="Text" Value="Fullscreen" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.4,0},{0.85,0},{0.475,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.35,0},{0.85,0},{0.425,0}}" />
<Event Name="CheckStateChanged" Function="GraphicsMenu.GraphicsFullscreenCheckbox_clicked"/>
</Window>
<Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsInfo" >
@@ -60,12 +73,12 @@
Changes in graphics
settings require
a game restart.</Property>
- <Property Name="TextColours" Value="FF4444FF" />
+ <Property Name="TextColours" Value="FFFFFFFF" />
<Property Name="InheritsAlpha" Value="False" />
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.525,0},{0.95,0},{0.92,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.425,0},{0.95,0},{0.85,0}}" />
</Window>
</Window>
<Window Type="MenuWidgets/Button" Name="orxonox/GraphicsBackButton" >
Modified: code/branches/presentation/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/presentation/data/gui/scripts/GraphicsMenu.lua 2010-12-19 13:29:44 UTC (rev 7778)
+++ code/branches/presentation/data/gui/scripts/GraphicsMenu.lua 2010-12-19 18:37:18 UTC (rev 7779)
@@ -3,6 +3,7 @@
local P = createMenuSheet("GraphicsMenu")
P.buttonList = {}
+P.schemeList = {"TaharezGreen", "Orxonox"}
function P.onShow()
--indices to iterate through buttonlist (trivial in this menu sheet)
@@ -96,8 +97,31 @@
["function"] = P.GraphicsBackButton_clicked
}
P.buttonList[1] = item
+
+ local dropbox = winMgr:getWindow("orxonox/ThemeDropBox")
+ local scheme = orxonox.CommandExecutor:query("getConfig GUIManager guiScheme_")
+ for k,v in pairs(P.schemeList) do
+ local item = CEGUI.createListboxTextItem(P.schemeList[k])
+ item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ CEGUI.toListbox(dropbox):addItem(item)
+ if v == scheme then
+ dropbox:setItemSelectState(item, true)
+ end
+ end
+
end
+function P.ThemeDropBox_changed(e)
+ local dropbox = winMgr:getWindow("orxonox/ThemeDropBox")
+ local listbox = CEGUI.toListbox(dropbox)
+ local choice = listbox:getFirstSelectedItem()
+ local index = 0
+ if choice ~= nil then
+ index = listbox:getItemIndex(choice)
+ end
+ orxonox.CommandExecutor:execute("config GUIManager guiScheme_ " .. P.schemeList[index+1])
+end
+
function P.GraphicsResolutionListbox_changed(e)
if listboxwindow:isItemSelected(0) then
resolution = "640 x 480"
More information about the Orxonox-commit
mailing list