Mercurial > sumwars
changeset 2693:d964db0e220d
refs #29: Corrected some paths used to access CEGUI objects. Still some work to do on about 4 files.
| author | Augustin Preda |
|---|---|
| date | Fri, 28 Mar 2014 00:32:47 +0200 |
| parents | bd1a2ea1c22f |
| children | 40c919cc4f28 |
| files | share/resources/gui_0.8/layouts/contenteditor.layout src/gui/contenteditor/contenteditor.cpp src/gui/contenteditor/fixedobjecteditor.cpp src/gui/contenteditor/fixedobjecteditor.h src/gui/contenteditor/gameinfotab.cpp src/gui/contenteditor/gameinfotab.h src/gui/contenteditor/itemeditor.cpp src/gui/contenteditor/itemeditor.h src/gui/contenteditor/monstereditor.cpp src/gui/contenteditor/monstereditor.h src/gui/contenteditor/renderinfoeditor.cpp src/gui/contenteditor/renderinfoeditor.h |
| diffstat | 12 files changed, 423 insertions(+), 349 deletions(-) [+] |
line wrap: on
line diff
--- a/share/resources/gui_0.8/layouts/contenteditor.layout Wed Mar 26 23:39:47 2014 +0200 +++ b/share/resources/gui_0.8/layouts/contenteditor.layout Fri Mar 28 00:32:47 2014 +0200 @@ -516,7 +516,7 @@ </Window> </Window> </Window> - </Window> + </Window> <Window type="DefaultWindow" name="ItemTab" > <Property name="Text" value="Item" /> <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" /> @@ -585,7 +585,7 @@ </Window> <Window type="TaharezLook/Spinner" name="PriceSpinner" > <Property name="Area" value="{{0.2,0},{0.25,0},{0.65,0},{0.3,0}}" /> - <Property name="StepSize" value="50" /> + <Property name="StepSize" value="50" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="10000" /> <Property name="MinimumValue" value="0" /> @@ -624,720 +624,720 @@ </Property> <Property name="Visible" value="False" /> <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" /> - - - <Window type="TaharezLook/StaticText" name="HealthLabel" > + + + <Window type="TaharezLook/StaticText" name="HealthLabel" > <Property name="Text" value="Health:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="HealthSpinner" > + + <Window type="TaharezLook/Spinner" name="HealthSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="10000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.03,0},{0.40,0},{0.08,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="AttrLabel" > + + <Window type="TaharezLook/StaticText" name="AttrLabel" > <Property name="Text" value="Attribute:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.10,0},{0.2,0},{0.16,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="StrengthLabel" > + + <Window type="TaharezLook/StaticText" name="StrengthLabel" > <Property name="Text" value="Strength:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.17,0},{0.2,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="StrengthSpinner" > + + <Window type="TaharezLook/Spinner" name="StrengthSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.17,0},{0.40,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="DexterityLabel" > + + <Window type="TaharezLook/StaticText" name="DexterityLabel" > <Property name="Text" value="Dexterity:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.17,0},{0.7,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="DexteritySpinner" > + + <Window type="TaharezLook/Spinner" name="DexteritySpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.7,0},{0.17,0},{0.90,0},{0.23,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="MagicPowerLabel" > + + + <Window type="TaharezLook/StaticText" name="MagicPowerLabel" > <Property name="Text" value="Magic Power:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.24,0},{0.2,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="MagicPowerSpinner" > + + <Window type="TaharezLook/Spinner" name="MagicPowerSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.24,0},{0.40,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="WillpowerLabel" > + + <Window type="TaharezLook/StaticText" name="WillpowerLabel" > <Property name="Text" value="Willpower:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.24,0},{0.7,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="WillpowerSpinner" > + + <Window type="TaharezLook/Spinner" name="WillpowerSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.7,0},{0.24,0},{0.90,0},{0.30,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="ResistancesLabel" > + + + <Window type="TaharezLook/StaticText" name="ResistancesLabel" > <Property name="Text" value="Resistances:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.32,0},{0.4,0},{0.38,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PhysResLabel" > + + <Window type="TaharezLook/StaticText" name="PhysResLabel" > <Property name="Text" value="Physical:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.39,0},{0.2,0},{0.45,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PhysResSpinner" > + + <Window type="TaharezLook/Spinner" name="PhysResSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="100" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.39,0},{0.40,0},{0.45,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="FireResLabel" > + + <Window type="TaharezLook/StaticText" name="FireResLabel" > <Property name="Text" value="Fire:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.39,0},{0.7,0},{0.45,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="FireResSpinner" > + + <Window type="TaharezLook/Spinner" name="FireResSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="100" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.7,0},{0.39,0},{0.90,0},{0.45,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="IceResLabel" > + + <Window type="TaharezLook/StaticText" name="IceResLabel" > <Property name="Text" value="Ice:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.46,0},{0.2,0},{0.52,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="IceResSpinner" > + + <Window type="TaharezLook/Spinner" name="IceResSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="100" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.46,0},{0.40,0},{0.52,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="AirResLabel" > + + <Window type="TaharezLook/StaticText" name="AirResLabel" > <Property name="Text" value="Air:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.46,0},{0.7,0},{0.52,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="AirResSpinner" > + + <Window type="TaharezLook/Spinner" name="AirResSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="100" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.7,0},{0.46,0},{0.90,0},{0.52,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="OtherLabel" > + + <Window type="TaharezLook/StaticText" name="OtherLabel" > <Property name="Text" value="Other:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.54,0},{0.2,0},{0.60,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="ArmorLabel" > + + <Window type="TaharezLook/StaticText" name="ArmorLabel" > <Property name="Text" value="Armor:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.61,0},{0.2,0},{0.67,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="ArmorSpinner" > + + <Window type="TaharezLook/Spinner" name="ArmorSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.61,0},{0.40,0},{0.67,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="BlockLabel" > + + <Window type="TaharezLook/StaticText" name="BlockLabel" > <Property name="Text" value="Block:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.61,0},{0.7,0},{0.67,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="BlockSpinner" > + + <Window type="TaharezLook/Spinner" name="BlockSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.7,0},{0.61,0},{0.90,0},{0.67,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="AttackLabel" > + + <Window type="TaharezLook/StaticText" name="AttackLabel" > <Property name="Text" value="Precision:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.68,0},{0.2,0},{0.74,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="AttackSpinner" > + + <Window type="TaharezLook/Spinner" name="AttackSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.68,0},{0.40,0},{0.74,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PowerLabel" > + + <Window type="TaharezLook/StaticText" name="PowerLabel" > <Property name="Text" value="Power:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.68,0},{0.7,0},{0.74,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PowerSpinner" > + + <Window type="TaharezLook/Spinner" name="PowerSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.7,0},{0.68,0},{0.90,0},{0.74,0}}" /> </Window> - + </Window> <Window type="DefaultWindow" name="Weapon" > <Property name="Text" >Weapon </Property> <Property name="Visible" value="False" /> <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" /> - - <Window type="TaharezLook/StaticText" name="TypeLabel" > + + <Window type="TaharezLook/StaticText" name="TypeLabel" > <Property name="Text" value="Type:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" /> </Window> - - <Window type="TaharezLook/Editbox" name="TypeBox" > + + <Window type="TaharezLook/Editbox" name="TypeBox" > <Property name="MaxTextLength" value="1073741823" /> <Property name="Area" value="{{0.2,0},{0.03,0},{0.65,0},{0.08,0}}" /> <Property name="TextParsingEnabled" value="False" /> </Window> - - <Window type="TaharezLook/StaticText" name="DamageLabel" > + + <Window type="TaharezLook/StaticText" name="DamageLabel" > <Property name="Text" value="Damage:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.10,0},{0.2,0},{0.16,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PhysLabel" > + + <Window type="TaharezLook/StaticText" name="PhysLabel" > <Property name="Text" value="Physical:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.17,0},{0.2,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PhysMinSpinner" > + + <Window type="TaharezLook/Spinner" name="PhysMinSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.22,0},{0.17,0},{0.42,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PhysToLabel" > + + <Window type="TaharezLook/StaticText" name="PhysToLabel" > <Property name="Text" value="-" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.44,0},{0.17,0},{0.48,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PhysMaxSpinner" > + + <Window type="TaharezLook/Spinner" name="PhysMaxSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.48,0},{0.17,0},{0.68,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PhysMultLabel" > + + <Window type="TaharezLook/StaticText" name="PhysMultLabel" > <Property name="Text" value="x" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.75,0},{0.17,0},{0.78,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PhysMultSpinner" > + + <Window type="TaharezLook/Spinner" name="PhysMultSpinner" > <Property name="StepSize" value="0.1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> - <Property name="TextInputMode" value="FloatingPoint" /> + <Property name="TextInputMode" value="FloatingPoint" /> <Property name="Area" value="{{0.78,0},{0.17,0},{0.98,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="FireLabel" > + + <Window type="TaharezLook/StaticText" name="FireLabel" > <Property name="Text" value="Fire:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.24,0},{0.2,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="FireMinSpinner" > + + <Window type="TaharezLook/Spinner" name="FireMinSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.22,0},{0.24,0},{0.42,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="FireToLabel" > + + <Window type="TaharezLook/StaticText" name="FireToLabel" > <Property name="Text" value="-" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.44,0},{0.24,0},{0.48,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="FireMaxSpinner" > + + <Window type="TaharezLook/Spinner" name="FireMaxSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.48,0},{0.24,0},{0.68,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="FireMultLabel" > + + <Window type="TaharezLook/StaticText" name="FireMultLabel" > <Property name="Text" value="x" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.75,0},{0.24,0},{0.78,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="FireMultSpinner" > + + <Window type="TaharezLook/Spinner" name="FireMultSpinner" > <Property name="StepSize" value="0.1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> - <Property name="TextInputMode" value="FloatingPoint" /> + <Property name="TextInputMode" value="FloatingPoint" /> <Property name="Area" value="{{0.78,0},{0.24,0},{0.98,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="IceLabel" > + + <Window type="TaharezLook/StaticText" name="IceLabel" > <Property name="Text" value="Ice:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.31,0},{0.2,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="IceMinSpinner" > + + <Window type="TaharezLook/Spinner" name="IceMinSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.22,0},{0.31,0},{0.42,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="IceToLabel" > + + <Window type="TaharezLook/StaticText" name="IceToLabel" > <Property name="Text" value="-" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.44,0},{0.31,0},{0.48,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="IceMaxSpinner" > + + <Window type="TaharezLook/Spinner" name="IceMaxSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.48,0},{0.31,0},{0.68,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="IceMultLabel" > + + <Window type="TaharezLook/StaticText" name="IceMultLabel" > <Property name="Text" value="x" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.75,0},{0.31,0},{0.78,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="IceMultSpinner" > + + <Window type="TaharezLook/Spinner" name="IceMultSpinner" > <Property name="StepSize" value="0.1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> - <Property name="TextInputMode" value="FloatingPoint" /> + <Property name="TextInputMode" value="FloatingPoint" /> <Property name="Area" value="{{0.78,0},{0.31,0},{0.98,0},{0.37,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="AirLabel" > + + + <Window type="TaharezLook/StaticText" name="AirLabel" > <Property name="Text" value="Air:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.38,0},{0.2,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="AirMinSpinner" > + + <Window type="TaharezLook/Spinner" name="AirMinSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.22,0},{0.38,0},{0.42,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="AirToLabel" > + + <Window type="TaharezLook/StaticText" name="AirToLabel" > <Property name="Text" value="-" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.44,0},{0.38,0},{0.48,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="AirMaxSpinner" > + + <Window type="TaharezLook/Spinner" name="AirMaxSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.48,0},{0.38,0},{0.68,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="AirMultLabel" > + + <Window type="TaharezLook/StaticText" name="AirMultLabel" > <Property name="Text" value="x" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.75,0},{0.38,0},{0.78,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="AirMultSpinner" > + + <Window type="TaharezLook/Spinner" name="AirMultSpinner" > <Property name="StepSize" value="0.1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="0" /> - <Property name="TextInputMode" value="FloatingPoint" /> + <Property name="TextInputMode" value="FloatingPoint" /> <Property name="Area" value="{{0.78,0},{0.38,0},{0.98,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PrecisionLabel" > + + <Window type="TaharezLook/StaticText" name="PrecisionLabel" > <Property name="Text" value="Precision:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.47,0},{0.2,0},{0.53,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PrecisionSpinner" > + + <Window type="TaharezLook/Spinner" name="PrecisionSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="1" /> <Property name="Area" value="{{0.20,0},{0.47,0},{0.40,0},{0.53,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PowerLabel" > + + <Window type="TaharezLook/StaticText" name="PowerLabel" > <Property name="Text" value="Power:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.53,0},{0.47,0},{0.7,0},{0.53,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PowerSpinner" > + + <Window type="TaharezLook/Spinner" name="PowerSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="32767" /> <Property name="MinimumValue" value="1" /> <Property name="Area" value="{{0.70,0},{0.47,0},{0.90,0},{0.53,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="RangeLabel" > + + + <Window type="TaharezLook/StaticText" name="RangeLabel" > <Property name="Text" value="Range:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.54,0},{0.2,0},{0.60,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="RangeSpinner" > + + <Window type="TaharezLook/Spinner" name="RangeSpinner" > <Property name="StepSize" value="0.1" /> <Property name="CurrentValue" value="1" /> <Property name="MaximumValue" value="50" /> <Property name="MinimumValue" value="0" /> - <Property name="TextInputMode" value="FloatingPoint" /> + <Property name="TextInputMode" value="FloatingPoint" /> <Property name="Area" value="{{0.20,0},{0.54,0},{0.40,0},{0.60,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="SpeedLabel" > + + <Window type="TaharezLook/StaticText" name="SpeedLabel" > <Property name="Text" value="Speed:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.53,0},{0.54,0},{0.7,0},{0.60,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="SpeedSpinner" > + + <Window type="TaharezLook/Spinner" name="SpeedSpinner" > <Property name="StepSize" value="50" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="5000" /> <Property name="MinimumValue" value="-2000" /> <Property name="Area" value="{{0.70,0},{0.54,0},{0.90,0},{0.60,0}}" /> </Window> - - - <Window type="TaharezLook/Checkbox" name="TwohandedCheckbox" > + + + <Window type="TaharezLook/Checkbox" name="TwohandedCheckbox" > <Property name="Area" value="{{0.03,0},{0.62,0},{0.07,0},{0.66,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="TwohandedLabel" > + + <Window type="TaharezLook/StaticText" name="TwohandedLabel" > <Property name="Text" value="Twohanded weapon" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.08,0},{0.61,0},{0.50,0},{0.67,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="CritPercentLabel" > + + + <Window type="TaharezLook/StaticText" name="CritPercentLabel" > <Property name="Text" value="Crit. Hits:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.68,0},{0.2,0},{0.74,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="CritPercentSpinner" > + + <Window type="TaharezLook/Spinner" name="CritPercentSpinner" > <Property name="StepSize" value="1" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="100" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.20,0},{0.68,0},{0.40,0},{0.74,0}}" /> </Window> - - + + </Window> <Window type="DefaultWindow" name="Consume" > <Property name="Text" >Consume</Property> <Property name="Visible" value="False" /> <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" /> - - <Window type="TaharezLook/StaticText" name="TypeLabel" > + + <Window type="TaharezLook/StaticText" name="TypeLabel" > <Property name="Text" value="Health:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="HealthSpinner" > + + <Window type="TaharezLook/Spinner" name="HealthSpinner" > <Property name="StepSize" value="50" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="10000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.2,0},{0.03,0},{0.40,0},{0.08,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="CureLabel" > + + + <Window type="TaharezLook/StaticText" name="CureLabel" > <Property name="Text" value="Status heal and immunity time:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.10,0},{0.7,0},{0.16,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="BlindLabel" > + + <Window type="TaharezLook/StaticText" name="BlindLabel" > <Property name="Text" value="Blind:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.17,0},{0.2,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="BlindSpinner" > + + <Window type="TaharezLook/Spinner" name="BlindSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.20,0},{0.17,0},{0.40,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="PoisonedLabel" > + + <Window type="TaharezLook/StaticText" name="PoisonedLabel" > <Property name="Text" value="Poisoned:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.17,0},{0.7,0},{0.23,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="PoisonedSpinner" > + + <Window type="TaharezLook/Spinner" name="PoisonedSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.70,0},{0.17,0},{0.90,0},{0.23,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="BerserkLabel" > + + + <Window type="TaharezLook/StaticText" name="BerserkLabel" > <Property name="Text" value="Berserk:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.24,0},{0.2,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="BerserkSpinner" > + + <Window type="TaharezLook/Spinner" name="BerserkSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.20,0},{0.24,0},{0.40,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="ConfusedLabel" > + + <Window type="TaharezLook/StaticText" name="ConfusedLabel" > <Property name="Text" value="Confused:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.24,0},{0.7,0},{0.30,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="ConfusedSpinner" > + + <Window type="TaharezLook/Spinner" name="ConfusedSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.70,0},{0.24,0},{0.90,0},{0.30,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="MuteLabel" > + + + <Window type="TaharezLook/StaticText" name="MuteLabel" > <Property name="Text" value="Mute:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.31,0},{0.2,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="MuteSpinner" > + + <Window type="TaharezLook/Spinner" name="MuteSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.20,0},{0.31,0},{0.40,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="ParalyzedLabel" > + + <Window type="TaharezLook/StaticText" name="ParalyzedLabel" > <Property name="Text" value="Paralyzed:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.31,0},{0.7,0},{0.37,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="ParalyzedSpinner" > + + <Window type="TaharezLook/Spinner" name="ParalyzedSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.70,0},{0.31,0},{0.90,0},{0.37,0}}" /> </Window> - - - <Window type="TaharezLook/StaticText" name="FrozenLabel" > + + + <Window type="TaharezLook/StaticText" name="FrozenLabel" > <Property name="Text" value="Frozen:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.03,0},{0.38,0},{0.2,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="FrozenSpinner" > + + <Window type="TaharezLook/Spinner" name="FrozenSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> <Property name="MinimumValue" value="0" /> <Property name="Area" value="{{0.20,0},{0.38,0},{0.40,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/StaticText" name="BurningLabel" > + + <Window type="TaharezLook/StaticText" name="BurningLabel" > <Property name="Text" value="Burning:" /> <Property name="HorzExtent" value="36" /> <Property name="VertExtent" value="15.5148" /> <Property name="FrameEnabled" value="False" /> <Property name="Area" value="{{0.52,0},{0.38,0},{0.7,0},{0.44,0}}" /> </Window> - - <Window type="TaharezLook/Spinner" name="BurningSpinner" > + + <Window type="TaharezLook/Spinner" name="BurningSpinner" > <Property name="StepSize" value="1000" /> <Property name="CurrentValue" value="0" /> <Property name="MaximumValue" value="1000000" /> @@ -1389,21 +1389,21 @@ </Window> </Window> </Window> - <Window type="TaharezLook/StaticImage" name="itemPreview" > + <Window type="TaharezLook/StaticImage" name="itemPreview" > <Property name="Area" value="{{0.535738,0},{0.0565595,0},{0.983904,0},{0.772162,0}}" /> </Window> </Window> - <Window type="DefaultWindow" name="GameInfoTab" > - <Property name="Text" value="Info" /> + <Window type="DefaultWindow" name="GameInfoTab" > + <Property name="Text" value="Info" /> <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" /> - <Window type="TaharezLook/MultiLineEditbox" name="TextBox" > + <Window type="TaharezLook/MultiLineEditbox" name="TextBox" > <Property name="Text" ></Property> <Property name="MaxTextLength" value="1073741823" /> <Property name="Area" value="{{0.0229259,0},{0.0172008,0},{0.986204,0},{0.901313,0}}" /> <Property name="TextParsingEnabled" value="True" /> </Window> - </Window> - </Window> + </Window> + </Window> <Window type="TaharezLook/Button" name="CloseButton" > <Property name="Text" value="Close" /> <Property name="Area" value="{{0.84668,0},{0.897134,0},{0.996094,0},{0.997395,0}}" />
--- a/src/gui/contenteditor/contenteditor.cpp Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/contenteditor.cpp Fri Mar 28 00:32:47 2014 +0200 @@ -68,28 +68,28 @@ CEGUIUtility::addChildWidget (m_rootWindow, rootWindow); // initialisation of the selected tabs for more intuitive use - CEGUI::TabControl* widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindow("ObjectInfoTabControl")); + CEGUI::TabControl* widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl")); if (widget) { widget->setSelectedTab("RenderInfoTab"); } - widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindow("RenderInfoTabControl")); + widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl")); if (widget) { - widget->setSelectedTab("RITab/BasicMesh"); + widget->setSelectedTab("BasicMesh"); } - widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindow("FixedObjectTabControl")); + widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl")); if (widget) { - widget->setSelectedTab("FOTab/Properties"); + widget->setSelectedTab("Properties"); } - widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindow("MonsterTabControl")); + widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl")); if (widget) { - widget->setSelectedTab("MonsterTab/Properties"); + widget->setSelectedTab("Properties"); } // create SceneManager for renderering images for the content editor @@ -156,7 +156,7 @@ #endif // place the image in a the CEGUI label - CEGUI::Window* label = CEGUIUtility::getWindow("RITab/BM/meshPreview"); + CEGUI::Window* label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/meshPreview"); CEGUI::String content_editor_image_name(CEGUIUtility::getImageNameWithSkin("editor_tex", "editor_img")); label->setProperty("Image", content_editor_image_name); // prev: "set:editor_imageset image:editor_img" @@ -165,16 +165,25 @@ label->subscribeEvent(CEGUI::Window::EventMouseButtonUp, CEGUI::Event::Subscriber(&ContentEditor::onPreviewWindowMouseUp, this)); label->subscribeEvent(CEGUI::Window::EventMouseWheel, CEGUI::Event::Subscriber(&ContentEditor::onPreviewWindowScrollWheel, this)); - CEGUI::PushButton* closebutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("CloseButton")); + CEGUI::PushButton* closebutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/CloseButton")); closebutton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ContentEditor::onClose, this)); closebutton = static_cast<CEGUI::FrameWindow*>(m_rootWindow)->getCloseButton(); closebutton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ContentEditor::onClose, this)); + SW_DEBUG("Content Editor: creating fixed object editor"); m_components["FOEditor"] = new FixedObjectEditor(); + + SW_DEBUG("Content Editor: creating render info editor"); m_components["RIEditor"] = new RenderInfoEditor(); + + SW_DEBUG("Content Editor: creating item editor"); m_components["ItemEditor"] = new ItemEditor(); + + SW_DEBUG("Content Editor: creating monster editor"); m_components["MonsterEditor"] = new MonsterEditor(); + + SW_DEBUG("Content Editor: creating game info tab"); m_components["GameInfoTab"] = new GameInfoTab(); std::map<std::string, ContentEditorTab*>::iterator it; @@ -254,316 +263,316 @@ textdomain("tools"); - label = CEGUIUtility::getWindow("RenderInfoTab"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab"); label->setText((CEGUI::utf8*) gettext("Render Info")); - label = CEGUIUtility::getWindow("RITab/BasicMesh"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl"); label->setText((CEGUI::utf8*) gettext("Mesh")); - label = CEGUIUtility::getWindow("RITab/BM/MainMeshLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/BasicMesh/MainMeshLabel"); label->setText((CEGUI::utf8*) gettext("Select main mesh:")); - label = CEGUIUtility::getWindow("RITab/SubMesh"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SubMesh"); label->setText((CEGUI::utf8*) gettext("Submeshes")); - label = CEGUIUtility::getWindow("RITab/SubMesh/AddSubMeshButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SubMesh/AddSubMeshButton"); label->setText((CEGUI::utf8*) gettext("Add Submesh")); - label = CEGUIUtility::getWindow("RITab/SM/NewSubmeshLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/NewSubmeshLabel"); label->setText((CEGUI::utf8*) gettext("New submesh:")); - label = CEGUIUtility::getWindow("RITab/SM/NewSMNameLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/NewSMNameLabel"); label->setText((CEGUI::utf8*) gettext("submesh name:")); - label = CEGUIUtility::getWindow("RITab/SM/EditSMLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/EditSMLabel"); label->setText((CEGUI::utf8*) gettext("Edit submesh:")); - label = CEGUIUtility::getWindow("RITab/SM/AttachMeshLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/AttachMeshLabel"); label->setText((CEGUI::utf8*) gettext("Attach to:")); - label = CEGUIUtility::getWindow("RITab/SM/BoneLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/BoneLabel"); label->setText((CEGUI::utf8*) gettext("at bone:")); - label = CEGUIUtility::getWindow("RITab/SM/RotateLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/RotateLabel"); label->setText((CEGUI::utf8*) gettext("Rotate(x,y,z):")); - label = CEGUIUtility::getWindow("RITab/SM/ScaleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/ScaleLabel"); label->setText((CEGUI::utf8*) gettext("Scale:")); - label = CEGUIUtility::getWindow("RITab/SM/OffsetLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/OffsetLabel"); label->setText((CEGUI::utf8*) gettext("Offset (x,y,z):")); - label = CEGUIUtility::getWindow("RITab/SubMesh/DelSubMeshButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SubMesh/DelSubMeshButton"); label->setText((CEGUI::utf8*) gettext("Delete Submesh")); - label = CEGUIUtility::getWindow("RITab/Animations"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/Animations"); label->setText((CEGUI::utf8*) gettext("Animations")); - label = CEGUIUtility::getWindow("RITab/XML"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/XML"); label->setText((CEGUI::utf8*) gettext("XML")); - label = CEGUIUtility::getWindow("RITab/XML/SubmitButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/XML/SubmitButton"); label->setText((CEGUI::utf8*) gettext("Submit XML")); - label = CEGUIUtility::getWindow("FixedObjectTab"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FixedObjectTab"); label->setText((CEGUI::utf8*) gettext("FixedObject")); - label = CEGUIUtility::getWindow("FOTab/Properties"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Properties"); label->setText((CEGUI::utf8*) gettext("Properties")); - label = CEGUIUtility::getWindow("FOTab/Prop/ShapeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/ShapeLabel"); label->setText((CEGUI::utf8*) gettext("Shape:")); - label = CEGUIUtility::getWindow("FOTab/Prop/CircleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/CircleLabel"); label->setText((CEGUI::utf8*) gettext("Circle")); - label = CEGUIUtility::getWindow("FOTab/Prop/RadiusLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/RadiusLabel"); label->setText((CEGUI::utf8*) gettext("Radius:")); - label = CEGUIUtility::getWindow("FOTab/Prop/DetectCircleButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectCircleButton"); label->setText((CEGUI::utf8*) gettext("Autodetect")); - label = CEGUIUtility::getWindow("FOTab/Prop/RectangleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/RectangleLabel"); label->setText((CEGUI::utf8*) gettext("Rectangle")); - label = CEGUIUtility::getWindow("FOTab/Prop/WidthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/WidthLabel"); label->setText((CEGUI::utf8*) gettext("Width:")); - label = CEGUIUtility::getWindow("FOTab/Prop/DepthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/DepthLabel"); label->setText((CEGUI::utf8*) gettext("Depth:")); - label = CEGUIUtility::getWindow("FOTab/Prop/DetectRectButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/DetectRectButton"); label->setText((CEGUI::utf8*) gettext("Autodetect")); - label = CEGUIUtility::getWindow("FOTab/Prop/CollisionLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/CollisionLabel"); label->setText((CEGUI::utf8*) gettext("Collision type")); - label = CEGUIUtility::getWindow("FOTab/Properties/CopyDataLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Properties/CopyDataLabel"); label->setText((CEGUI::utf8*) gettext("Copy data from:")); - label = CEGUIUtility::getWindow("FOTab/Properties/CopyDataButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Properties/CopyDataButton"); label->setText((CEGUI::utf8*) gettext("Copy")); - label = CEGUIUtility::getWindow("FOTab/Create"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create"); label->setText((CEGUI::utf8*) gettext("Create Object")); - label = CEGUIUtility::getWindow("FOTab/XML/CreateButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/XML/CreateButton"); label->setText((CEGUI::utf8*) gettext("Create Object")); - label = CEGUIUtility::getWindow("FOTab/Create/PosLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/PosLabel"); label->setText((CEGUI::utf8*) gettext("Position:")); - label = CEGUIUtility::getWindow("FOTab/Create/GetPlPosButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/GetPlPosButton"); label->setText((CEGUI::utf8*) gettext("Get Player Position")); - label = CEGUIUtility::getWindow("FOTab/Create/AngleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/AngleLabel"); label->setText((CEGUI::utf8*) gettext("Angle:")); - label = CEGUIUtility::getWindow("FOTab/Create/DelAllButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/DelAllButton"); label->setText((CEGUI::utf8*) gettext("Delete all objects")); - label = CEGUIUtility::getWindow("FOTab/XML"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/XML"); label->setText((CEGUI::utf8*) gettext("XML")); - label = CEGUIUtility::getWindow("FOTab/XML/SubmitButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/XML/SubmitButton"); label->setText((CEGUI::utf8*) gettext("Submit XML")); - label = CEGUIUtility::getWindow("ItemTab"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab"); label->setText((CEGUI::utf8*) gettext("Item")); - label = CEGUIUtility::getWindow("ItemTab/General"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General"); label->setText((CEGUI::utf8*) gettext("General")); - label = CEGUIUtility::getWindow("ItemTab/Properties/TypeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/TypeLabel"); label->setText((CEGUI::utf8*) gettext("Type:")); - label = CEGUIUtility::getWindow("ItemTab/Properties/SizeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/SizeLabel"); label->setText((CEGUI::utf8*) gettext("Size:")); - label = CEGUIUtility::getWindow("ItemTab/Properties/CopyDataLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/CopyDataLabel"); label->setText((CEGUI::utf8*) gettext("Copy data from:")); - label = CEGUIUtility::getWindow("ItemTab/Properties/CopyDataButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/CopyDataButton"); label->setText((CEGUI::utf8*) gettext("Copy")); - label = CEGUIUtility::getWindow("ItemTab/General/NameLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/NameLabel"); label->setText((CEGUI::utf8*) gettext("Name:")); - label = CEGUIUtility::getWindow("ItemTab/General/PriceLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/PriceLabel"); label->setText((CEGUI::utf8*) gettext("Value:")); - label = CEGUIUtility::getWindow("ItemTab/General/EnchantRangeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/EnchantRangeLabel"); label->setText((CEGUI::utf8*) gettext("Enchant min:")); - label = CEGUIUtility::getWindow("ItemTab/General/EnchantMaxLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/EnchantMaxLabel"); label->setText((CEGUI::utf8*) gettext("max:")); - label = CEGUIUtility::getWindow("ItemTab/Equip"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip"); label->setText((CEGUI::utf8*) gettext("Equip")); - label = CEGUIUtility::getWindow("ItemTab/Equip/HealthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/HealthLabel"); label->setText((CEGUI::utf8*) gettext("Health:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/AttrLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/AttrLabel"); label->setText((CEGUI::utf8*) gettext("Attribute:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/StrengthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/StrengthLabel"); label->setText((CEGUI::utf8*) gettext("Strength:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/DexterityLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/DexterityLabel"); label->setText((CEGUI::utf8*) gettext("Dexterity:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/MagicPowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/MagicPowerLabel"); label->setText((CEGUI::utf8*) gettext("Magic Power:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/WillpowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/WillpowerLabel"); label->setText((CEGUI::utf8*) gettext("Willpower:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/ResistancesLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/ResistancesLabel"); label->setText((CEGUI::utf8*) gettext("Resistances:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/PhysResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/PhysResLabel"); label->setText((CEGUI::utf8*) gettext("Physical:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/FireResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/FireResLabel"); label->setText((CEGUI::utf8*) gettext("Fire:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/IceResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/IceResLabel"); label->setText((CEGUI::utf8*) gettext("Ice:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/AirResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/AirResLabel"); label->setText((CEGUI::utf8*) gettext("Air:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/OtherLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/OtherLabel"); label->setText((CEGUI::utf8*) gettext("Other:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/ArmorLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/ArmorLabel"); label->setText((CEGUI::utf8*) gettext("Armor:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/BlockLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/BlockLabel"); label->setText((CEGUI::utf8*) gettext("Block:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/AttackLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/AttackLabel"); label->setText((CEGUI::utf8*) gettext("Precision:")); - label = CEGUIUtility::getWindow("ItemTab/Equip/PowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/PowerLabel"); label->setText((CEGUI::utf8*) gettext("Power:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon"); label->setText((CEGUI::utf8*) gettext("Weapon")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/TypeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/TypeLabel"); label->setText((CEGUI::utf8*) gettext("Type:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/DamageLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/DamageLabel"); label->setText((CEGUI::utf8*) gettext("Damage:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/PhysLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PhysLabel"); label->setText((CEGUI::utf8*) gettext("Physical:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/PhysToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PhysToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/PhysMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PhysMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/FireLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/FireLabel"); label->setText((CEGUI::utf8*) gettext("Fire:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/FireToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/FireToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/FireMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/FireMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/IceLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/IceLabel"); label->setText((CEGUI::utf8*) gettext("Ice:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/IceToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/IceToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/IceMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/IceMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/AirLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/AirLabel"); label->setText((CEGUI::utf8*) gettext("Air:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/AirToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/AirToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/AirMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/AirMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/PrecisionLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PrecisionLabel"); label->setText((CEGUI::utf8*) gettext("Precision:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/PowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PowerLabel"); label->setText((CEGUI::utf8*) gettext("Power:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/RangeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/RangeLabel"); label->setText((CEGUI::utf8*) gettext("Range:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/SpeedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/SpeedLabel"); label->setText((CEGUI::utf8*) gettext("Speed:")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/TwohandedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/TwohandedLabel"); label->setText((CEGUI::utf8*) gettext("Twohanded weapon")); - label = CEGUIUtility::getWindow("ItemTab/Weapon/CritPercentLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/CritPercentLabel"); label->setText((CEGUI::utf8*) gettext("Crit. Hits:")); - label = CEGUIUtility::getWindow("ItemTab/Consume"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume"); label->setText((CEGUI::utf8*) gettext("Consume")); - label = CEGUIUtility::getWindow("ItemTab/Consume/TypeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/TypeLabel"); label->setText((CEGUI::utf8*) gettext("Health:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/CureLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/CureLabel"); label->setText((CEGUI::utf8*) gettext("Status heal and immunity time:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/BlindLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/BlindLabel"); label->setText((CEGUI::utf8*) gettext("Blind:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/PoisonedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/PoisonedLabel"); label->setText((CEGUI::utf8*) gettext("Poisoned:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/BerserkLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/BerserkLabel"); label->setText((CEGUI::utf8*) gettext("Berserk:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/ConfusedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/ConfusedLabel"); label->setText((CEGUI::utf8*) gettext("Confused:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/MuteLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/MuteLabel"); label->setText((CEGUI::utf8*) gettext("Mute:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/ParalyzedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/ParalyzedLabel"); label->setText((CEGUI::utf8*) gettext("Paralyzed:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/FrozenLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/FrozenLabel"); label->setText((CEGUI::utf8*) gettext("Frozen:")); - label = CEGUIUtility::getWindow("ItemTab/Consume/BurningLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/BurningLabel"); label->setText((CEGUI::utf8*) gettext("Burning:")); - label = CEGUIUtility::getWindow("ItemTab/Create"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create"); label->setText((CEGUI::utf8*) gettext("Create Item")); - label = CEGUIUtility::getWindow("ItemTab/Create/EnchantLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create/EnchantLabel"); label->setText((CEGUI::utf8*) gettext("Enchant:")); - label = CEGUIUtility::getWindow("ItemTab/Create/CreateInventoryButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create/CreateInventoryButton"); label->setText((CEGUI::utf8*) gettext("Create in inventory")); - label = CEGUIUtility::getWindow("ItemTab/Create/CreateDropButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create/CreateDropButton"); label->setText((CEGUI::utf8*) gettext("Create an drop")); - label = CEGUIUtility::getWindow("ItemTab/XML"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/XML"); label->setText((CEGUI::utf8*) gettext("XML")); - label = CEGUIUtility::getWindow("ItemTab/XML/SubmitButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/XML/SubmitButton"); label->setText((CEGUI::utf8*) gettext("Submit XML")); - label = CEGUIUtility::getWindow("CloseButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "CloseButton"); label->setText((CEGUI::utf8*) gettext("Close")); textdomain("menu");
--- a/src/gui/contenteditor/fixedobjecteditor.cpp Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/fixedobjecteditor.cpp Fri Mar 28 00:32:47 2014 +0200 @@ -27,18 +27,26 @@ void FixedObjectEditor::init(CEGUI::Window* parent) { ContentEditorTab::init(parent); + m_rootWindow = parent; CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::PushButton* detectCircleButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Prop/DetectCircleButton")); - CEGUI::PushButton* detectRectButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Prop/DetectRectButton")); + CEGUI::PushButton* detectCircleButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectCircleButton" /*"FOTab/Prop/DetectCircleButton"*/)); + CEGUI::PushButton* detectRectButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectRectButton"/*"FOTab/Prop/DetectRectButton"*/)); - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/RadiusSpinner")); - CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/WidthSpinner")); - CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/DepthSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RadiusSpinner")); + CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/WidthSpinner")); + CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DepthSpinner")); - CEGUI::RadioButton* circleButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindow("FOTab/Prop/CircleCheckbox")); - CEGUI::RadioButton* rectButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindow("FOTab/Prop/RectangleCheckbox")); + CEGUI::RadioButton* circleButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CircleCheckbox")); + CEGUI::RadioButton* rectButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RectangleCheckbox")); radiusSpinner->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectModified, this)); widthSpinner->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectModified, this)); @@ -51,7 +59,8 @@ detectCircleButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectAutodetectSize, this)); detectRectButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectAutodetectSize, this)); - CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("FOTab/Prop/LayerSelector")); + CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/LayerSelector")); layerSelector->addItem(new CEGUI::ListboxTextItem("Normal")); layerSelector->addItem(new CEGUI::ListboxTextItem("Base")); layerSelector->addItem(new CEGUI::ListboxTextItem("Air")); @@ -59,16 +68,20 @@ layerSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectModified, this)); - CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/XML/SubmitButton")); + CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/XML/SubmitButton")); xmlsubmitButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectXMLModified, this)); - CEGUI::PushButton* createFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/XML/CreateButton")); + CEGUI::PushButton* createFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/CreateButton")); createFOButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onFixedObjectCreate, this)); - CEGUI::PushButton* delallFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Create/DelAllButton")); + CEGUI::PushButton* delallFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/DelAllButton")); delallFOButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onDelAllObjects, this)); - CEGUI::PushButton* getplayerButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Create/GetPlPosButton")); + CEGUI::PushButton* getplayerButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/GetPlPosButton")); getplayerButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onGetPlayerPosition, this)); @@ -110,7 +123,8 @@ { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* copyfoSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("FOTab/Properties/CopyDataBox")); + CEGUI::Combobox* copyfoSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/Properties/CopyDataBox")); // Fill list of all FixedObjects const std::map<GameObject::Subtype, FixedObjectData*>& all_fo = ObjectFactory::getAllFixedObjectData(); @@ -120,7 +134,8 @@ copyfoSelector->addItem(new CEGUI::ListboxTextItem(it->first.c_str())); } - CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Properties/CopyDataButton")); + CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/Properties/CopyDataButton")); copyfoButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&FixedObjectEditor::onCopyData, this)); } @@ -135,7 +150,8 @@ TiXmlPrinter printer; m_fixed_object_xml.Accept(&printer); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("FOTab/XML/FOXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/XML/FOXMLEditbox")); editor->setText(printer.CStr()); } @@ -145,14 +161,20 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("FOTab/Prop/LayerSelector")); + CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/LayerSelector")); - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/RadiusSpinner")); - CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/WidthSpinner")); - CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/DepthSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RadiusSpinner")); + CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/WidthSpinner")); + CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DepthSpinner")); - CEGUI::RadioButton* circleButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindow("FOTab/Prop/CircleCheckbox")); - CEGUI::RadioButton* rectButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindow("FOTab/Prop/RectangleCheckbox")); + CEGUI::RadioButton* circleButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CircleCheckbox")); + CEGUI::RadioButton* rectButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RectangleCheckbox")); // adjust the spinner values if (m_edited_fixed_object.m_shape.m_type == Shape::CIRCLE) @@ -195,14 +217,20 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::RadioButton* CircleButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindow("FOTab/Prop/CircleCheckbox")); - //CEGUI::RadioButton* RectButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindow("FOTab/Prop/RectangleCheckbox")); + CEGUI::RadioButton* CircleButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CircleCheckbox")); + //CEGUI::RadioButton* RectButton = static_cast<CEGUI::RadioButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + //"Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RectangleCheckbox")); - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/RadiusSpinner")); - CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/WidthSpinner")); - CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/DepthSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RadiusSpinner")); + CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/WidthSpinner")); + CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DepthSpinner")); - CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("FOTab/Prop/LayerSelector")); + CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/LayerSelector")); if (CircleButton->getSelectedButtonInGroup() == CircleButton) { @@ -238,12 +266,17 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::PushButton* detectCircleButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Prop/DetectCircleButton")); - //CEGUI::PushButton* detectRectButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("FOTab/Prop/DetectRectButton")); + CEGUI::PushButton* detectCircleButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "FOTab/Prop/DetectCircleButton")); + //CEGUI::PushButton* detectRectButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + //"FOTab/Prop/DetectRectButton")); - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/RadiusSpinner")); - CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/WidthSpinner")); - CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("FOTab/Prop/DepthSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RadiusSpinner")); + CEGUI::Spinner* widthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/WidthSpinner")); + CEGUI::Spinner* depthSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DepthSpinner")); // calculate the size of the bounding box RenderInfoEditor* ri_editor = dynamic_cast<RenderInfoEditor*>(ContentEditor::getSingleton().getComponent("RIEditor")); @@ -276,7 +309,8 @@ bool FixedObjectEditor::onFixedObjectXMLModified(const CEGUI::EventArgs& evt) { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("FOTab/XML/FOXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "FOTab/XML/FOXMLEditbox")); // Parse the editor text to XML // use temporary XML document for recovering from errors
--- a/src/gui/contenteditor/fixedobjecteditor.h Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/fixedobjecteditor.h Fri Mar 28 00:32:47 2014 +0200 @@ -130,6 +130,11 @@ * The first integer is the region ID, the second is the object ID */ std::list< std::pair<int,int> > m_created_objects; + + /** + * \brief The root window to use when accessing the widgets. + */ + CEGUI::Window* m_rootWindow; };
--- a/src/gui/contenteditor/gameinfotab.cpp Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/gameinfotab.cpp Fri Mar 28 00:32:47 2014 +0200 @@ -27,9 +27,11 @@ void GameInfoTab::init(CEGUI::Window* parent) { ContentEditorTab::init(parent); + m_rootWindow = parent; CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - m_ShowBox = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("GameInfoTab/TextBox")); + m_ShowBox = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/GameInfoTab/TextBox")); } void GameInfoTab::update()
--- a/src/gui/contenteditor/gameinfotab.h Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/gameinfotab.h Fri Mar 28 00:32:47 2014 +0200 @@ -90,6 +90,11 @@ * @brief holds the world info as string */ std::string m_world_info; + + /** + * \brief The root window to use when accessing the widgets. + */ + CEGUI::Window* m_rootWindow; };
--- a/src/gui/contenteditor/itemeditor.cpp Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/itemeditor.cpp Fri Mar 28 00:32:47 2014 +0200 @@ -34,6 +34,7 @@ void ItemEditor::init(CEGUI::Window* parent) { ContentEditorTab::init(parent); + m_rootWindow = parent; CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton();
--- a/src/gui/contenteditor/itemeditor.h Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/itemeditor.h Fri Mar 28 00:32:47 2014 +0200 @@ -140,6 +140,12 @@ * \brief unique ID for items */ int m_unique_id; + + /** + * \brief The root window to use when accessing the widgets. + */ + CEGUI::Window* m_rootWindow; + };
--- a/src/gui/contenteditor/monstereditor.cpp Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/monstereditor.cpp Fri Mar 28 00:32:47 2014 +0200 @@ -31,6 +31,7 @@ void MonsterEditor::init(CEGUI::Window* parent) { ContentEditorTab::init(parent); + m_rootWindow = parent; CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton();
--- a/src/gui/contenteditor/monstereditor.h Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/monstereditor.h Fri Mar 28 00:32:47 2014 +0200 @@ -131,6 +131,11 @@ * The first integer is the region ID, the second is the object ID */ std::list< std::pair<int,int> > m_created_objects; + + /** + * \brief The root window to use when accessing the widgets. + */ + CEGUI::Window* m_rootWindow; };
--- a/src/gui/contenteditor/renderinfoeditor.cpp Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/renderinfoeditor.cpp Fri Mar 28 00:32:47 2014 +0200 @@ -29,7 +29,8 @@ void RenderInfoEditor::init(CEGUI::Window* parent) { ContentEditorTab::init(parent); - + m_rootWindow = parent; + m_edited_graphicobject=0; m_unique_id = 1;
--- a/src/gui/contenteditor/renderinfoeditor.h Wed Mar 26 23:39:47 2014 +0200 +++ b/src/gui/contenteditor/renderinfoeditor.h Fri Mar 28 00:32:47 2014 +0200 @@ -160,6 +160,11 @@ */ int m_unique_id; + /** + * \brief The root window to use when accessing the widgets. + */ + CEGUI::Window* m_rootWindow; + };