[Orxonox-commit 3225] r7916 - in code/branches/usability/data/gui: configs schemes scripts
landauf at orxonox.net
landauf at orxonox.net
Sat Feb 19 17:05:08 CET 2011
Author: landauf
Date: 2011-02-19 17:05:08 +0100 (Sat, 19 Feb 2011)
New Revision: 7916
Modified:
code/branches/usability/data/gui/configs/CEGUIConfig.xsd
code/branches/usability/data/gui/schemes/GUIScheme.xsd
code/branches/usability/data/gui/schemes/OrxonoxLook.scheme
code/branches/usability/data/gui/schemes/TaharezGreenLook.scheme
code/branches/usability/data/gui/schemes/TaharezLook.scheme
code/branches/usability/data/gui/scripts/MultiplayerMenu.lua
Log:
replaced tabs with spaces in files where they were used mixed
Modified: code/branches/usability/data/gui/configs/CEGUIConfig.xsd
===================================================================
--- code/branches/usability/data/gui/configs/CEGUIConfig.xsd 2011-02-19 15:38:44 UTC (rev 7915)
+++ code/branches/usability/data/gui/configs/CEGUIConfig.xsd 2011-02-19 16:05:08 UTC (rev 7916)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <xsd:element name="CEGUIConfig" type="CEGUIConfigType"/>
+ <xsd:element name="CEGUIConfig" type="CEGUIConfigType"/>
<xsd:simpleType name="LogLevel">
<xsd:restriction base="xsd:string">
@@ -11,18 +11,18 @@
<xsd:enumeration value="Insane"/>
</xsd:restriction>
</xsd:simpleType>
-
- <xsd:complexType name="CEGUIConfigType">
- <xsd:attribute name="Logfile" type="xsd:string" use="optional" default=""/>
- <xsd:attribute name="Scheme" type="xsd:string" use="optional" default=""/>
- <xsd:attribute name="DefaultFont" type="xsd:string" use="optional" default=""/>
- <xsd:attribute name="Layout" type="xsd:string" use="optional" default=""/>
- <xsd:attribute name="InitScript" type="xsd:string" use="optional" default=""/>
- <xsd:attribute name="TerminateScript" type="xsd:string" use="optional" default=""/>
- <xsd:attribute name="DefaultResourceGroup" type="xsd:string" use="optional" default="" />
+
+ <xsd:complexType name="CEGUIConfigType">
+ <xsd:attribute name="Logfile" type="xsd:string" use="optional" default=""/>
+ <xsd:attribute name="Scheme" type="xsd:string" use="optional" default=""/>
+ <xsd:attribute name="DefaultFont" type="xsd:string" use="optional" default=""/>
+ <xsd:attribute name="Layout" type="xsd:string" use="optional" default=""/>
+ <xsd:attribute name="InitScript" type="xsd:string" use="optional" default=""/>
+ <xsd:attribute name="TerminateScript" type="xsd:string" use="optional" default=""/>
+ <xsd:attribute name="DefaultResourceGroup" type="xsd:string" use="optional" default="" />
<xsd:attribute name="LoggingLevel" type="LogLevel" use="optional" default="Standard" />
- </xsd:complexType>
-
+ </xsd:complexType>
+
</xsd:schema>
Modified: code/branches/usability/data/gui/schemes/GUIScheme.xsd
===================================================================
--- code/branches/usability/data/gui/schemes/GUIScheme.xsd 2011-02-19 15:38:44 UTC (rev 7915)
+++ code/branches/usability/data/gui/schemes/GUIScheme.xsd 2011-02-19 16:05:08 UTC (rev 7916)
@@ -1,54 +1,54 @@
<?xml version="1.0" ?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <xsd:element name="GUIScheme" type="SchemeType" />
- <xsd:complexType name="SchemeType">
+ <xsd:element name="GUIScheme" type="SchemeType" />
+ <xsd:complexType name="SchemeType">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="Imageset" type="NamedDataType" />
+ <xsd:element name="Imageset" type="NamedDataType" />
<xsd:element name="ImagesetFromImage" type="NamedDataType" />
- <xsd:element name="Font" type="NamedDataType" />
+ <xsd:element name="Font" type="NamedDataType" />
<xsd:element name="LookNFeel" type="FileDataType" />
- <xsd:element name="WindowSet" type="WindowSetType" />
- <xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
- <xsd:element name="WindowAlias" type="WindowAliasType" />
+ <xsd:element name="WindowSet" type="WindowSetType" />
+ <xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
+ <xsd:element name="WindowAlias" type="WindowAliasType" />
<xsd:element name="FalagardMapping" type="FalagardMapType" />
- </xsd:choice>
- <xsd:attribute name="Name" type="xsd:string" use="required" />
- </xsd:complexType>
- <xsd:complexType name="WindowSetType">
- <xsd:sequence>
+ </xsd:choice>
+ <xsd:attribute name="Name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ <xsd:complexType name="WindowSetType">
+ <xsd:sequence>
<xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="Filename" type="xsd:string" use="required" />
- </xsd:complexType>
- <xsd:complexType name="WindowRendererSetType">
- <xsd:sequence>
+ </xsd:sequence>
+ <xsd:attribute name="Filename" type="xsd:string" use="required" />
+ </xsd:complexType>
+ <xsd:complexType name="WindowRendererSetType">
+ <xsd:sequence>
<xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="Filename" type="xsd:string" use="required" />
- </xsd:complexType>
+ </xsd:sequence>
+ <xsd:attribute name="Filename" type="xsd:string" use="required" />
+ </xsd:complexType>
<xsd:complexType name="FileDataType">
<xsd:attribute name="Filename" type="xsd:string" use="required" />
<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" />
</xsd:complexType>
- <xsd:complexType name="NamedDataType">
- <xsd:attribute name="Name" type="xsd:string" use="required" />
- <xsd:attribute name="Filename" type="xsd:string" use="required" />
- <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" />
- </xsd:complexType>
- <xsd:complexType name="WindowFactoryType">
- <xsd:attribute name="Name" type="xsd:string" use="required" />
- </xsd:complexType>
- <xsd:complexType name="WindowRendererFactoryType">
- <xsd:attribute name="Name" type="xsd:string" use="required" />
- </xsd:complexType>
- <xsd:complexType name="WindowAliasType">
- <xsd:attribute name="Alias" type="xsd:string" use="required" />
- <xsd:attribute name="Target" type="xsd:string" use="required" />
- </xsd:complexType>
+ <xsd:complexType name="NamedDataType">
+ <xsd:attribute name="Name" type="xsd:string" use="required" />
+ <xsd:attribute name="Filename" type="xsd:string" use="required" />
+ <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" />
+ </xsd:complexType>
+ <xsd:complexType name="WindowFactoryType">
+ <xsd:attribute name="Name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ <xsd:complexType name="WindowRendererFactoryType">
+ <xsd:attribute name="Name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ <xsd:complexType name="WindowAliasType">
+ <xsd:attribute name="Alias" type="xsd:string" use="required" />
+ <xsd:attribute name="Target" type="xsd:string" use="required" />
+ </xsd:complexType>
<xsd:complexType name="FalagardMapType">
<xsd:attribute name="WindowType" type="xsd:string" use="required" />
<xsd:attribute name="TargetType" type="xsd:string" use="required" />
- <xsd:attribute name="Renderer" type="xsd:string" use="required" />
+ <xsd:attribute name="Renderer" type="xsd:string" use="required" />
<xsd:attribute name="LookNFeel" type="xsd:string" use="required" />
</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
Modified: code/branches/usability/data/gui/schemes/OrxonoxLook.scheme
===================================================================
--- code/branches/usability/data/gui/schemes/OrxonoxLook.scheme 2011-02-19 15:38:44 UTC (rev 7915)
+++ code/branches/usability/data/gui/schemes/OrxonoxLook.scheme 2011-02-19 16:05:08 UTC (rev 7916)
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<GUIScheme Name="OrxonoxLook">
- <Imageset Name="OrxonoxLook" Filename="OrxonoxLook.imageset" />
- <LookNFeel Filename="OrxonoxLook.looknfeel" />
- <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+ <Imageset Name="OrxonoxLook" Filename="OrxonoxLook.imageset" />
+ <LookNFeel Filename="OrxonoxLook.looknfeel" />
+ <WindowRendererSet Filename="CEGUIFalagardWRBase" />
<!-- Standard widgets -->
<FalagardMapping WindowType="OrxonoxLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="OrxonoxLook/StaticImage" />
@@ -44,7 +44,7 @@
<FalagardMapping WindowType="OrxonoxLook/Titlebar" TargetType="CEGUI/Titlebar" Renderer="Falagard/Titlebar" LookNFeel="OrxonoxLook/Titlebar" />
<FalagardMapping WindowType="OrxonoxLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="OrxonoxLook/Tooltip" />
<FalagardMapping WindowType="OrxonoxLook/Tree" TargetType="CEGUI/Tree" Renderer="Falagard/Tree" LookNFeel="OrxonoxLook/Tree" />
-
+
<!-- Additional widgets -->
<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" />
Modified: code/branches/usability/data/gui/schemes/TaharezGreenLook.scheme
===================================================================
--- code/branches/usability/data/gui/schemes/TaharezGreenLook.scheme 2011-02-19 15:38:44 UTC (rev 7915)
+++ code/branches/usability/data/gui/schemes/TaharezGreenLook.scheme 2011-02-19 16:05:08 UTC (rev 7916)
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<GUIScheme Name="TaharezGreenLook">
- <Imageset Name="TaharezGreenLook" Filename="TaharezGreenLook.imageset" />
- <LookNFeel Filename="TaharezGreenLook.looknfeel" />
- <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+ <Imageset Name="TaharezGreenLook" Filename="TaharezGreenLook.imageset" />
+ <LookNFeel Filename="TaharezGreenLook.looknfeel" />
+ <WindowRendererSet Filename="CEGUIFalagardWRBase" />
<!-- Standard widgets -->
<FalagardMapping WindowType="TaharezGreenLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezGreenLook/StaticImage" />
@@ -44,7 +44,7 @@
<FalagardMapping WindowType="TaharezGreenLook/Titlebar" TargetType="CEGUI/Titlebar" Renderer="Falagard/Titlebar" LookNFeel="TaharezGreenLook/Titlebar" />
<FalagardMapping WindowType="TaharezGreenLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezGreenLook/Tooltip" />
<FalagardMapping WindowType="TaharezGreenLook/Tree" TargetType="CEGUI/Tree" Renderer="Falagard/Tree" LookNFeel="TaharezGreenLook/Tree" />
-
+
<!-- Additional widgets -->
<FalagardMapping WindowType="TaharezGreenLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezGreenLook/AltProgressBar" />
<FalagardMapping WindowType="TaharezGreenLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezGreenLook/VUMeter" />
Modified: code/branches/usability/data/gui/schemes/TaharezLook.scheme
===================================================================
--- code/branches/usability/data/gui/schemes/TaharezLook.scheme 2011-02-19 15:38:44 UTC (rev 7915)
+++ code/branches/usability/data/gui/schemes/TaharezLook.scheme 2011-02-19 16:05:08 UTC (rev 7916)
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<GUIScheme Name="TaharezLook">
- <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
- <LookNFeel Filename="TaharezLook.looknfeel" />
- <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+ <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
+ <LookNFeel Filename="TaharezLook.looknfeel" />
+ <WindowRendererSet Filename="CEGUIFalagardWRBase" />
<!-- Standard widgets -->
<FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" />
@@ -44,7 +44,7 @@
<FalagardMapping WindowType="TaharezLook/Titlebar" TargetType="CEGUI/Titlebar" Renderer="Falagard/Titlebar" LookNFeel="TaharezLook/Titlebar" />
<FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" />
<FalagardMapping WindowType="TaharezLook/Tree" TargetType="CEGUI/Tree" Renderer="Falagard/Tree" LookNFeel="TaharezLook/Tree" />
-
+
<!-- Additional widgets -->
<FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" />
<FalagardMapping WindowType="TaharezLook/VUMeter" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
Modified: code/branches/usability/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/MultiplayerMenu.lua 2011-02-19 15:38:44 UTC (rev 7915)
+++ code/branches/usability/data/gui/scripts/MultiplayerMenu.lua 2011-02-19 16:05:08 UTC (rev 7916)
@@ -9,7 +9,7 @@
P.joinMode = 1
function P.onLoad()
- P.multiplayerMode = "startClient"
+ P.multiplayerMode = "startClient"
--button are arranged in a 2x2 matrix, the left lower item is nil
local item = {
@@ -37,7 +37,7 @@
--indices to iterate through buttonlist
P.oldindex = -2
P.index = -1
-
+
if P.joinMode == 1 then
local window = winMgr:getWindow("orxonox/MultiplayerLanButton")
local button = tolua.cast(window,"CEGUI::RadioButton")
@@ -55,7 +55,7 @@
local button = tolua.cast(we.window,"CEGUI::RadioButton")
P.joinMode = 1
if button:isSelected() == true then
- P.showServerList()
+ P.showServerList()
end
end
@@ -64,8 +64,8 @@
local button = tolua.cast(we.window,"CEGUI::RadioButton")
P.joinMode = 2
if button:isSelected() == true then
- P.showServerList()
- end
+ P.showServerList()
+ end
end
function P.MultiplayerHostButton_clicked(e)
@@ -91,73 +91,73 @@
end
function P.showServerList()
- -- LAN Discovery
- if P.joinMode == 1 then
- local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
- CEGUI.toListbox(listbox):resetList()
- local discovery = orxonox.LANDiscovery:getInstance()
- discovery:discover()
- P.serverList = {}
- local index = 0
- local servername = ""
- local serverip = ""
- while true do
- servername = discovery:getServerListItemName(index)
- if servername == "" then
- break
- end
- serverip = discovery:getServerListItemIP(index)
- if serverip == "" then
- break
- end
- table.insert(P.serverList, {servername, serverip})
- index = index + 1
- end
- index = 1
- for k,v in pairs(P.serverList) do
- local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
- item:setID(index)
- index = index + 1
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
- CEGUI.toListbox(listbox):addItem(item)
- end
- -- WAN Discovery
- elseif P.joinMode == 2 then
- local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
- CEGUI.toListbox(listbox):resetList()
- local discovery = orxonox.WANDiscovery:getInstance()
- cout(0, "discovering.\n" )
- discovery:discover()
- cout(0, "discovered.\n" )
- P.serverList = {}
- local index = 0
- local servername = ""
- local serverip = ""
- while true do
- servername = discovery:getServerListItemName(index)
- if servername == "" then
- break
- end
- serverip = discovery:getServerListItemIP(index)
- if serverip == "" then
- break
- end
- table.insert(P.serverList, {servername, serverip})
- index = index + 1
- end
- index = 1
- for k,v in pairs(P.serverList) do
- local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
- item:setID(index)
- index = index + 1
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
- CEGUI.toListbox(listbox):addItem(item)
- end
- end
-
+ -- LAN Discovery
+ if P.joinMode == 1 then
+ local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
+ CEGUI.toListbox(listbox):resetList()
+ local discovery = orxonox.LANDiscovery:getInstance()
+ discovery:discover()
+ P.serverList = {}
+ local index = 0
+ local servername = ""
+ local serverip = ""
+ while true do
+ servername = discovery:getServerListItemName(index)
+ if servername == "" then
+ break
+ end
+ serverip = discovery:getServerListItemIP(index)
+ if serverip == "" then
+ break
+ end
+ table.insert(P.serverList, {servername, serverip})
+ index = index + 1
+ end
+ index = 1
+ for k,v in pairs(P.serverList) do
+ local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
+ item:setID(index)
+ index = index + 1
+ item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ CEGUI.toListbox(listbox):addItem(item)
+ end
+ -- WAN Discovery
+ elseif P.joinMode == 2 then
+ local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
+ CEGUI.toListbox(listbox):resetList()
+ local discovery = orxonox.WANDiscovery:getInstance()
+ cout(0, "discovering.\n" )
+ discovery:discover()
+ cout(0, "discovered.\n" )
+ P.serverList = {}
+ local index = 0
+ local servername = ""
+ local serverip = ""
+ while true do
+ servername = discovery:getServerListItemName(index)
+ if servername == "" then
+ break
+ end
+ serverip = discovery:getServerListItemIP(index)
+ if serverip == "" then
+ break
+ end
+ table.insert(P.serverList, {servername, serverip})
+ index = index + 1
+ end
+ index = 1
+ for k,v in pairs(P.serverList) do
+ local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
+ item:setID(index)
+ index = index + 1
+ item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ CEGUI.toListbox(listbox):addItem(item)
+ end
+ end
+
end
-function P.onKeyPressed()
+function P.onKeyPressed()
buttonIteratorHelper(P.buttonList, code, P, 2, 2)
end
More information about the Orxonox-commit
mailing list