Mercurial > sumwars
changeset 2695:29a269dc5fd3
refs #29: Corrected more paths used to access CEGUI objects. Application can start. Still to do: hide the damned debug window :-)
| author | Augustin Preda |
|---|---|
| date | Sat, 29 Mar 2014 00:41:42 +0200 |
| parents | 40c919cc4f28 |
| children | 287738b8843e |
| files | src/gui/contenteditor/contenteditor.cpp src/gui/contenteditor/contenteditortab.cpp src/gui/contenteditor/contenteditortab.h src/gui/contenteditor/fixedobjecteditor.cpp src/gui/contenteditor/itemeditor.cpp src/gui/contenteditor/monstereditor.cpp src/gui/contenteditor/renderinfoeditor.cpp |
| diffstat | 7 files changed, 658 insertions(+), 350 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui/contenteditor/contenteditor.cpp Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/contenteditor.cpp Sat Mar 29 00:41:42 2014 +0200 @@ -67,6 +67,8 @@ CEGUIUtility::setWidgetSizeRel(rootWindow, 1.0f, 1.0f); CEGUIUtility::addChildWidget (m_rootWindow, rootWindow); + CEGUIUtility::dumpFullWindowToLog(rootWindow); + // initialisation of the selected tabs for more intuitive use CEGUI::TabControl* widget = static_cast<CEGUI::TabControl*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl")); if (widget) @@ -263,316 +265,419 @@ textdomain("tools"); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab"); label->setText((CEGUI::utf8*) gettext("Render Info")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl"); label->setText((CEGUI::utf8*) gettext("Mesh")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/BasicMesh/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::getWindowForLoadedLayout(m_rootWindow, "RITab/SubMesh"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh"); label->setText((CEGUI::utf8*) gettext("Submeshes")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SubMesh/AddSubMeshButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AddSubMeshButton"); label->setText((CEGUI::utf8*) gettext("Add Submesh")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/NewSubmeshLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/NewSubmeshLabel"); label->setText((CEGUI::utf8*) gettext("New submesh:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/NewSMNameLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/NewSMNameLabel"); label->setText((CEGUI::utf8*) gettext("submesh name:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/EditSMLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/EditSMLabel"); label->setText((CEGUI::utf8*) gettext("Edit submesh:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/AttachMeshLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachMeshLabel"); label->setText((CEGUI::utf8*) gettext("Attach to:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/BoneLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/BoneLabel"); label->setText((CEGUI::utf8*) gettext("at bone:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/RotateLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/RotateLabel"); label->setText((CEGUI::utf8*) gettext("Rotate(x,y,z):")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/ScaleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/ScaleLabel"); label->setText((CEGUI::utf8*) gettext("Scale:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SM/OffsetLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/OffsetLabel"); label->setText((CEGUI::utf8*) gettext("Offset (x,y,z):")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/SubMesh/DelSubMeshButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/DelSubMeshButton"); label->setText((CEGUI::utf8*) gettext("Delete Submesh")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/Animations"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/Animations"); label->setText((CEGUI::utf8*) gettext("Animations")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/XML"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/XML"); label->setText((CEGUI::utf8*) gettext("XML")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "RITab/XML/SubmitButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/XML/SubmitButton"); label->setText((CEGUI::utf8*) gettext("Submit XML")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FixedObjectTab"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab"); label->setText((CEGUI::utf8*) gettext("FixedObject")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Properties"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties"); label->setText((CEGUI::utf8*) gettext("Properties")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/ShapeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/ShapeLabel"); label->setText((CEGUI::utf8*) gettext("Shape:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/CircleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CircleLabel"); label->setText((CEGUI::utf8*) gettext("Circle")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/RadiusLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RadiusLabel"); label->setText((CEGUI::utf8*) gettext("Radius:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectCircleButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectCircleButton"); label->setText((CEGUI::utf8*) gettext("Autodetect")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/RectangleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/RectangleLabel"); label->setText((CEGUI::utf8*) gettext("Rectangle")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/WidthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/WidthLabel"); label->setText((CEGUI::utf8*) gettext("Width:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/DepthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DepthLabel"); label->setText((CEGUI::utf8*) gettext("Depth:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/DetectRectButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectRectButton"); label->setText((CEGUI::utf8*) gettext("Autodetect")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Prop/CollisionLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CollisionLabel"); label->setText((CEGUI::utf8*) gettext("Collision type")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Properties/CopyDataLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CopyDataLabel"); label->setText((CEGUI::utf8*) gettext("Copy data from:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Properties/CopyDataButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/CopyDataButton"); label->setText((CEGUI::utf8*) gettext("Copy")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create"); label->setText((CEGUI::utf8*) gettext("Create Object")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/XML/CreateButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/CreateButton"); label->setText((CEGUI::utf8*) gettext("Create Object")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/PosLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/PosLabel"); label->setText((CEGUI::utf8*) gettext("Position:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/GetPlPosButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/GetPlPosButton"); label->setText((CEGUI::utf8*) gettext("Get Player Position")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/AngleLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/AngleLabel"); label->setText((CEGUI::utf8*) gettext("Angle:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/Create/DelAllButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Create/DelAllButton"); label->setText((CEGUI::utf8*) gettext("Delete all objects")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/XML"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/XML"); label->setText((CEGUI::utf8*) gettext("XML")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "FOTab/XML/SubmitButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/XML/SubmitButton"); label->setText((CEGUI::utf8*) gettext("Submit XML")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab"); label->setText((CEGUI::utf8*) gettext("Item")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General"); label->setText((CEGUI::utf8*) gettext("General")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/TypeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeLabel"); label->setText((CEGUI::utf8*) gettext("Type:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/SizeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/SizeLabel"); label->setText((CEGUI::utf8*) gettext("Size:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/CopyDataLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/CopyDataLabel"); label->setText((CEGUI::utf8*) gettext("Copy data from:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Properties/CopyDataButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/CopyDataButton"); label->setText((CEGUI::utf8*) gettext("Copy")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/NameLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameLabel"); label->setText((CEGUI::utf8*) gettext("Name:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/PriceLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/PriceLabel"); label->setText((CEGUI::utf8*) gettext("Value:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/EnchantRangeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantRangeLabel"); label->setText((CEGUI::utf8*) gettext("Enchant min:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/General/EnchantMaxLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxLabel"); label->setText((CEGUI::utf8*) gettext("max:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip"); label->setText((CEGUI::utf8*) gettext("Equip")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/HealthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthLabel"); label->setText((CEGUI::utf8*) gettext("Health:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/AttrLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttrLabel"); label->setText((CEGUI::utf8*) gettext("Attribute:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/StrengthLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthLabel"); label->setText((CEGUI::utf8*) gettext("Strength:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/DexterityLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexterityLabel"); label->setText((CEGUI::utf8*) gettext("Dexterity:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/MagicPowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerLabel"); label->setText((CEGUI::utf8*) gettext("Magic Power:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/WillpowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerLabel"); label->setText((CEGUI::utf8*) gettext("Willpower:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/ResistancesLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ResistancesLabel"); label->setText((CEGUI::utf8*) gettext("Resistances:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/PhysResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResLabel"); label->setText((CEGUI::utf8*) gettext("Physical:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/FireResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResLabel"); label->setText((CEGUI::utf8*) gettext("Fire:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/IceResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResLabel"); label->setText((CEGUI::utf8*) gettext("Ice:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/AirResLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResLabel"); label->setText((CEGUI::utf8*) gettext("Air:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/OtherLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/OtherLabel"); label->setText((CEGUI::utf8*) gettext("Other:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/ArmorLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorLabel"); label->setText((CEGUI::utf8*) gettext("Armor:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/BlockLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockLabel"); label->setText((CEGUI::utf8*) gettext("Block:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/AttackLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackLabel"); label->setText((CEGUI::utf8*) gettext("Precision:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Equip/PowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerLabel"); label->setText((CEGUI::utf8*) gettext("Power:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon"); label->setText((CEGUI::utf8*) gettext("Weapon")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/TypeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeLabel"); label->setText((CEGUI::utf8*) gettext("Type:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/DamageLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/DamageLabel"); label->setText((CEGUI::utf8*) gettext("Damage:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PhysLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysLabel"); label->setText((CEGUI::utf8*) gettext("Physical:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PhysToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PhysMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/FireLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireLabel"); label->setText((CEGUI::utf8*) gettext("Fire:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/FireToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/FireMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/IceLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceLabel"); label->setText((CEGUI::utf8*) gettext("Ice:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/IceToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/IceMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/AirLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirLabel"); label->setText((CEGUI::utf8*) gettext("Air:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/AirToLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirToLabel"); label->setText((CEGUI::utf8*) gettext("-")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/AirMultLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultLabel"); label->setText((CEGUI::utf8*) gettext("x")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PrecisionLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionLabel"); label->setText((CEGUI::utf8*) gettext("Precision:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/PowerLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerLabel"); label->setText((CEGUI::utf8*) gettext("Power:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/RangeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeLabel"); label->setText((CEGUI::utf8*) gettext("Range:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/SpeedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedLabel"); label->setText((CEGUI::utf8*) gettext("Speed:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/TwohandedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TwohandedLabel"); label->setText((CEGUI::utf8*) gettext("Twohanded weapon")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Weapon/CritPercentLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentLabel"); label->setText((CEGUI::utf8*) gettext("Crit. Hits:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume"); label->setText((CEGUI::utf8*) gettext("Consume")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/TypeLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/TypeLabel"); label->setText((CEGUI::utf8*) gettext("Health:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/CureLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/CureLabel"); label->setText((CEGUI::utf8*) gettext("Status heal and immunity time:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/BlindLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindLabel"); label->setText((CEGUI::utf8*) gettext("Blind:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/PoisonedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedLabel"); label->setText((CEGUI::utf8*) gettext("Poisoned:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/BerserkLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkLabel"); label->setText((CEGUI::utf8*) gettext("Berserk:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/ConfusedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedLabel"); label->setText((CEGUI::utf8*) gettext("Confused:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/MuteLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteLabel"); label->setText((CEGUI::utf8*) gettext("Mute:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/ParalyzedLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedLabel"); label->setText((CEGUI::utf8*) gettext("Paralyzed:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/FrozenLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenLabel"); label->setText((CEGUI::utf8*) gettext("Frozen:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Consume/BurningLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningLabel"); label->setText((CEGUI::utf8*) gettext("Burning:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create"); label->setText((CEGUI::utf8*) gettext("Create Item")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create/EnchantLabel"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create/EnchantLabel"); label->setText((CEGUI::utf8*) gettext("Enchant:")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create/CreateInventoryButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create/CreateInventoryButton"); label->setText((CEGUI::utf8*) gettext("Create in inventory")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/Create/CreateDropButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create/CreateDropButton"); label->setText((CEGUI::utf8*) gettext("Create an drop")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/XML"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML"); label->setText((CEGUI::utf8*) gettext("XML")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "ItemTab/XML/SubmitButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/SubmitButton"); label->setText((CEGUI::utf8*) gettext("Submit XML")); - label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "CloseButton"); + label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/CloseButton"); label->setText((CEGUI::utf8*) gettext("Close")); textdomain("menu");
--- a/src/gui/contenteditor/contenteditortab.cpp Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/contenteditortab.cpp Sat Mar 29 00:41:42 2014 +0200 @@ -26,7 +26,7 @@ { CEGUI::utf8* str = (CEGUI::utf8*) (text.c_str()); //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Window* win = CEGUIUtility::getWindow(windowname); + CEGUI::Window* win = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname); if (win != 0) { @@ -40,7 +40,7 @@ std::string ContentEditorTab::getWindowText(std::string windowname, std::string def) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Window* win = CEGUIUtility::getWindow(windowname); + CEGUI::Window* win = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname); if (win != 0) { @@ -52,7 +52,7 @@ void ContentEditorTab::setSpinnerValue(std::string windowname, double value) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Spinner* spinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow(windowname)); + CEGUI::Spinner* spinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (spinner != 0) { @@ -66,7 +66,7 @@ double ContentEditorTab::getSpinnerValue(std::string windowname, double def) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Spinner* spinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow(windowname)); + CEGUI::Spinner* spinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (spinner != 0) { @@ -78,7 +78,7 @@ void ContentEditorTab::setCheckboxSelected(std::string windowname, bool state) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUIUtility::ToggleButton* box = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindow(windowname)); + CEGUIUtility::ToggleButton* box = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (box != 0) { @@ -92,7 +92,7 @@ bool ContentEditorTab::getCheckboxSelected(std::string windowname) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUIUtility::ToggleButton* box = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindow(windowname)); + CEGUIUtility::ToggleButton* box = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (box != 0) { @@ -104,7 +104,7 @@ std::string ContentEditorTab::getComboboxSelection(std::string windowname, std::string def) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* box = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow(windowname)); + CEGUI::Combobox* box = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (box != 0) { @@ -120,7 +120,7 @@ void ContentEditorTab::setComboboxSelection(std::string windowname, std::string selection) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* box = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow(windowname)); + CEGUI::Combobox* box = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (box != 0) { @@ -137,7 +137,7 @@ void ContentEditorTab::setMultiLineEditboxCursor(std::string windowname, int row, int col) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow(windowname)); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, windowname)); if (editor != 0) {
--- a/src/gui/contenteditor/contenteditortab.h Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/contenteditortab.h Sat Mar 29 00:41:42 2014 +0200 @@ -35,6 +35,7 @@ virtual void init(CEGUI::Window* parent) { m_no_cegui_events = false; + m_rootWindow = parent; } /** @@ -134,6 +135,13 @@ * \brief marks that underlying game data should be reloaded */ bool m_update_base_content; + + /** + * \var CEGUI::Window *m_rootWindow; + * \brief Pointer to the root window of this panel + */ + CEGUI::Window* m_rootWindow; + };
--- a/src/gui/contenteditor/fixedobjecteditor.cpp Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/fixedobjecteditor.cpp Sat Mar 29 00:41:42 2014 +0200 @@ -32,7 +32,7 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); CEGUI::PushButton* detectCircleButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, - "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectCircleButton" /*"FOTab/Prop/DetectCircleButton"*/)); + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/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"*/)); @@ -267,7 +267,7 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); CEGUI::PushButton* detectCircleButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, - "FOTab/Prop/DetectCircleButton")); + "Root/ObjectInfoTabControl/__auto_TabPane__/FixedObjectTab/FixedObjectTabControl/__auto_TabPane__/Properties/DetectCircleButton")); //CEGUI::PushButton* detectRectButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, //"FOTab/Prop/DetectRectButton"));
--- a/src/gui/contenteditor/itemeditor.cpp Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/itemeditor.cpp Sat Mar 29 00:41:42 2014 +0200 @@ -38,28 +38,36 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("ItemTab/XML/SubmitButton")); + CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/SubmitButton")); xmlsubmitButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onItemXMLModified, this)); - CEGUI::PushButton* createDropButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("ItemTab/Create/CreateDropButton")); + CEGUI::PushButton* createDropButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/Create/CreateDropButton")); createDropButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onItemCreateDrop, this)); - CEGUI::PushButton* createInvButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("ItemTab/Create/CreateInventoryButton")); + CEGUI::PushButton* createInvButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/Create/CreateInventoryButton")); createInvButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onItemCreateInInventory, this)); - CEGUI::Spinner* enchantMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/General/EnchantMinSpinner")); + CEGUI::Spinner* enchantMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/EnchantMinSpinner")); enchantMin->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); - CEGUI::Spinner* enchantMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/General/EnchantMaxSpinner")); + CEGUI::Spinner* enchantMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/EnchantMaxSpinner")); enchantMax->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); - CEGUI::Spinner* price = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/General/PriceSpinner")); + CEGUI::Spinner* price = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/PriceSpinner")); price->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); - CEGUI::Editbox* nameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindow("ItemTab/General/NameBox")); + CEGUI::Editbox* nameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/General/NameBox")); nameBox->subscribeEvent(CEGUI::Editbox::EventTextChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); - CEGUI::Combobox* typeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("ItemTab/Properties/TypeBox")); + CEGUI::Combobox* typeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox")); typeSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); typeSelector->addItem(new CEGUI::ListboxTextItem("Armor")); typeSelector->addItem(new CEGUI::ListboxTextItem("Weapon")); @@ -73,7 +81,8 @@ typeSelector->setSelection(0,0); - CEGUI::Combobox* sizeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("ItemTab/Properties/SizeBox")); + CEGUI::Combobox* sizeSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/SizeBox")); sizeSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); sizeSelector->addItem(new CEGUI::ListboxTextItem("Big")); sizeSelector->addItem(new CEGUI::ListboxTextItem("Medium")); @@ -81,93 +90,197 @@ sizeSelector->setText("Big"); sizeSelector->setSelection(0,0); - CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("ItemTab/Properties/CopyDataButton")); + CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/CopyDataButton")); copyfoButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&ItemEditor::onCopyData, this)); // wire weaponattr tab - CEGUI::Editbox* wtype = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindow("ItemTab/Weapon/TypeBox")); + CEGUI::Editbox* wtype = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox")); wtype->subscribeEvent(CEGUI::Editbox::EventTextChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* physMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/PhysMinSpinner")); + CEGUI::Spinner* physMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner")); physMin->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* physMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/PhysMaxSpinner")); + CEGUI::Spinner* physMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner")); physMax->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* physMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/PhysMultSpinner")); + CEGUI::Spinner* physMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner")); physMult->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* fireMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/FireMinSpinner")); + CEGUI::Spinner* fireMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner")); fireMin->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* fireMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/FireMaxSpinner")); + CEGUI::Spinner* fireMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner")); fireMax->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onItemModified, this)); - CEGUI::Spinner* fireMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/FireMultSpinner")); + CEGUI::Spinner* fireMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner")); fireMult->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* iceMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/IceMinSpinner")); + CEGUI::Spinner* iceMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner")); iceMin->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* iceMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/IceMaxSpinner")); + CEGUI::Spinner* iceMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner")); iceMax->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* iceMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/IceMultSpinner")); + CEGUI::Spinner* iceMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner")); iceMult->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* airMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/AirMinSpinner")); + CEGUI::Spinner* airMin = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner")); airMin->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* airMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/AirMaxSpinner")); + CEGUI::Spinner* airMax = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner")); airMax->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* airMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/AirMultSpinner")); + CEGUI::Spinner* airMult = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner")); airMult->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* precision = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/PrecisionSpinner")); + CEGUI::Spinner* precision = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner")); precision->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* power = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/PowerSpinner")); + CEGUI::Spinner* power = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner")); power->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* range = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/RangeSpinner")); + CEGUI::Spinner* range = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeSpinner")); range->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* speed = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/SpeedSpinner")); + CEGUI::Spinner* speed = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedSpinner")); speed->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUI::Spinner* critperc = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Weapon/CritPercentSpinner")); + CEGUI::Spinner* critperc = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner")); critperc->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); - CEGUIUtility::ToggleButton* twohanded = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindow("ItemTab/Weapon/TwohandedCheckbox")); + CEGUIUtility::ToggleButton* twohanded = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TwohandedCheckbox")); twohanded->subscribeEvent(CEGUIUtility::EventToggleButtonStateChanged(), CEGUI::Event::Subscriber(&ItemEditor::onWeaponModified, this)); // Wire the consume tab - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/HealthSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/BlindSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/PoisonedSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/BerserkSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/ConfusedSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/MuteSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/ParalyzedSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/FrozenSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Consume/BurningSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/HealthSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onConsumeEffectsModified, this)); // wire the equip tab - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/HealthSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/StrengthSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/DexteritySpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/MagicPowerSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/WillpowerSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/PhysResSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/FireResSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/IceResSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/AirResSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/ArmorSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/BlockSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/AttackSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); - static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("ItemTab/Equip/PowerSpinner"))-> subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); + + static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner"))-> subscribeEvent( + CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&ItemEditor::onEquipEffectsModified, this)); // init the internal data @@ -176,7 +289,7 @@ item_root->SetAttribute("subtype","EditorItem"); TiXmlElement * item_image = new TiXmlElement("Image"); - item_image->SetAttribute("image","set:noMedia.png image:full_image"); + item_image->SetAttribute("image","noMedia.png"); // previously: "set:noMedia.png image:full_image" item_root->LinkEndChild(item_image); TiXmlElement * item_ri = new TiXmlElement("RenderInfo"); @@ -227,7 +340,10 @@ { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* copyItemSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("ItemTab/Properties/CopyDataBox")); + CEGUI::Combobox* copyItemSelector = static_cast<CEGUI::Combobox*>( + CEGUIUtility::getWindowForLoadedLayout( + m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/CopyDataBox")); // Fill list of all FixedObjects const std::map<Item::Subtype,ItemBasicData*>& all_items = ItemFactory::getAllItemData(); @@ -241,20 +357,32 @@ bool ItemEditor::onItemModified(const CEGUI::EventArgs& evt) { if (m_no_cegui_events) + { return true; + } + m_no_cegui_events = true; - m_edited_item.m_price = (int) getSpinnerValue("ItemTab/General/PriceSpinner",1); - m_edited_item.m_min_enchant = getSpinnerValue("ItemTab/General/EnchantMinSpinner",1); - m_edited_item.m_max_enchant = getSpinnerValue("ItemTab/General/EnchantMaxSpinner",1); + m_edited_item.m_price = (int) getSpinnerValue( + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/PriceSpinner", + 1); + + m_edited_item.m_min_enchant = getSpinnerValue( + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMinSpinner", + 1); + + m_edited_item.m_max_enchant = getSpinnerValue( + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner", + 1); + if (m_edited_item.m_max_enchant < m_edited_item.m_min_enchant) { m_edited_item.m_max_enchant = m_edited_item.m_min_enchant; - setSpinnerValue("ItemTab/General/EnchantMaxSpinner",m_edited_item.m_max_enchant); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner",m_edited_item.m_max_enchant); } - m_edited_item.m_name = getWindowText("ItemTab/General/NameBox","EditorItem"); + m_edited_item.m_name = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameBox","EditorItem"); - std::string type = getWindowText("ItemTab/Properties/TypeBox","Weapon"); + std::string type = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox","Weapon"); m_edited_item.m_type = Item::WEAPON; if (type == "Armor") m_edited_item.m_type = Item::ARMOR; else if (type == "Weapon") m_edited_item.m_type = Item::WEAPON; @@ -265,7 +393,7 @@ else if (type == "Shield") m_edited_item.m_type = Item::SHIELD; else if (type == "Potion") m_edited_item.m_type = Item::POTION; - std::string size = getWindowText("ItemTab/Properties/SizeBox","Big"); + std::string size = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox","Big"); m_edited_item.m_size = Item::BIG; if (size == "Big") m_edited_item.m_size = Item::BIG; else if (size == "Medium") m_edited_item.m_size = Item::MEDIUM; @@ -288,53 +416,53 @@ m_edited_item.m_weapon_attr = new WeaponAttr; } - m_edited_item.m_weapon_attr->m_weapon_type = getWindowText("ItemTab/Weapon/TypeLabel","sword"); + m_edited_item.m_weapon_attr->m_weapon_type = getWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeLabel","sword"); Damage& dmg = m_edited_item.m_weapon_attr->m_damage; - dmg.m_min_damage[Damage::PHYSICAL] = getSpinnerValue("ItemTab/Weapon/PhysMinSpinner",1); - dmg.m_max_damage[Damage::PHYSICAL] = getSpinnerValue("ItemTab/Weapon/PhysMaxSpinner",1); + dmg.m_min_damage[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner",1); + dmg.m_max_damage[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner",1); if (dmg.m_max_damage[Damage::PHYSICAL] < dmg.m_min_damage[Damage::PHYSICAL]) { dmg.m_max_damage[Damage::PHYSICAL] = dmg.m_min_damage[Damage::PHYSICAL]; - setSpinnerValue("ItemTab/Weapon/PhysMaxSpinner",dmg.m_max_damage[Damage::PHYSICAL]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner",dmg.m_max_damage[Damage::PHYSICAL]); } - dmg.m_multiplier[Damage::PHYSICAL] = getSpinnerValue("ItemTab/Weapon/PhysMultSpinner",1); + dmg.m_multiplier[Damage::PHYSICAL] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner",1); - dmg.m_min_damage[Damage::FIRE] = getSpinnerValue("ItemTab/Weapon/FireMinSpinner",1); - dmg.m_max_damage[Damage::FIRE] = getSpinnerValue("ItemTab/Weapon/FireMaxSpinner",1); + dmg.m_min_damage[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner",1); + dmg.m_max_damage[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner",1); if (dmg.m_max_damage[Damage::FIRE] < dmg.m_min_damage[Damage::FIRE]) { dmg.m_max_damage[Damage::FIRE] = dmg.m_min_damage[Damage::FIRE]; - setSpinnerValue("ItemTab/Weapon/FireMaxSpinner",dmg.m_max_damage[Damage::FIRE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner",dmg.m_max_damage[Damage::FIRE]); } - dmg.m_multiplier[Damage::FIRE] = getSpinnerValue("ItemTab/Weapon/FireMultSpinner",1); + dmg.m_multiplier[Damage::FIRE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner",1); - dmg.m_min_damage[Damage::ICE] = getSpinnerValue("ItemTab/Weapon/IceMinSpinner",1); - dmg.m_max_damage[Damage::ICE] = getSpinnerValue("ItemTab/Weapon/IceMaxSpinner",1); + dmg.m_min_damage[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner",1); + dmg.m_max_damage[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner",1); if (dmg.m_max_damage[Damage::ICE] < dmg.m_min_damage[Damage::ICE]) { dmg.m_max_damage[Damage::ICE] = dmg.m_min_damage[Damage::ICE]; - setSpinnerValue("ItemTab/Weapon/IceMaxSpinner",dmg.m_max_damage[Damage::ICE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner",dmg.m_max_damage[Damage::ICE]); } - dmg.m_multiplier[Damage::ICE] = getSpinnerValue("ItemTab/Weapon/IceMultSpinner",1); + dmg.m_multiplier[Damage::ICE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner",1); - dmg.m_min_damage[Damage::AIR] = getSpinnerValue("ItemTab/Weapon/AirMinSpinner",1); - dmg.m_max_damage[Damage::AIR] = getSpinnerValue("ItemTab/Weapon/AirMaxSpinner",1); + dmg.m_min_damage[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner",1); + dmg.m_max_damage[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner",1); if (dmg.m_max_damage[Damage::AIR] < dmg.m_min_damage[Damage::AIR]) { dmg.m_max_damage[Damage::AIR] = dmg.m_min_damage[Damage::AIR]; - setSpinnerValue("ItemTab/Weapon/AirMaxSpinner",dmg.m_max_damage[Damage::AIR]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner",dmg.m_max_damage[Damage::AIR]); } - dmg.m_multiplier[Damage::AIR] = getSpinnerValue("ItemTab/Weapon/AirMultSpinner",1); + dmg.m_multiplier[Damage::AIR] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner",1); - dmg.m_attack = getSpinnerValue("ItemTab/Weapon/PrecisionSpinner",1); - dmg.m_power = getSpinnerValue("ItemTab/Weapon/PowerSpinner",1); - dmg.m_crit_perc = 0.01* getSpinnerValue("ItemTab/Weapon/CritPercentSpinner",1); + dmg.m_attack = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner",1); + dmg.m_power = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner",1); + dmg.m_crit_perc = 0.01* getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner",1); - m_edited_item.m_weapon_attr->m_attack_range = getSpinnerValue("ItemTab/Weapon/RangeSpinner"); - m_edited_item.m_weapon_attr->m_dattack_speed = (int) getSpinnerValue("ItemTab/Weapon/SpeedSpinner"); - m_edited_item.m_weapon_attr->m_two_handed = getCheckboxSelected("ItemTab/Weapon/TwohandedCheckbox"); + m_edited_item.m_weapon_attr->m_attack_range = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeSpinner"); + m_edited_item.m_weapon_attr->m_dattack_speed = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedSpinner"); + m_edited_item.m_weapon_attr->m_two_handed = getCheckboxSelected("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TwohandedCheckbox"); m_no_cegui_events = false; m_modified_item = true; @@ -355,15 +483,15 @@ CreatureDynAttrMod* dynmod = m_edited_item.m_useup_effect; - dynmod->m_dhealth = getSpinnerValue("ItemTab/Consume/HealthSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::BLIND] = getSpinnerValue("ItemTab/Consume/BlindSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::POISONED] = getSpinnerValue("ItemTab/Consume/PoisonedSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::BERSERK] = getSpinnerValue("ItemTab/Consume/BerserkSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::CONFUSED] = getSpinnerValue("ItemTab/Consume/ConfusedSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::MUTE] = getSpinnerValue("ItemTab/Consume/MuteSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::PARALYZED] = getSpinnerValue("ItemTab/Consume/ParalyzedSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::FROZEN] = getSpinnerValue("ItemTab/Consume/FrozenSpinner"); - dynmod->m_dstatus_mod_immune_time[Damage::BURNING] = getSpinnerValue("ItemTab/Consume/BurningSpinner"); + dynmod->m_dhealth = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/HealthSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::BLIND] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::POISONED] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::BERSERK] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::CONFUSED] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::MUTE] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::PARALYZED] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::FROZEN] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner"); + dynmod->m_dstatus_mod_immune_time[Damage::BURNING] = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner"); m_no_cegui_events = false; m_modified_item = true; @@ -384,22 +512,22 @@ CreatureBaseAttrMod* basemod = m_edited_item.m_equip_effect; - basemod->m_dmax_health = getSpinnerValue("ItemTab/Equip/HealthSpinner"); + basemod->m_dmax_health = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner"); - basemod->m_dstrength = (int) getSpinnerValue("ItemTab/Equip/StrengthSpinner"); - basemod->m_ddexterity = (int) getSpinnerValue("ItemTab/Equip/DexteritySpinner"); - basemod->m_dmagic_power = (int) getSpinnerValue("ItemTab/Equip/MagicPowerSpinner"); - basemod->m_dwillpower = (int) getSpinnerValue("ItemTab/Equip/WillpowerSpinner"); + basemod->m_dstrength = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner"); + basemod->m_ddexterity = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner"); + basemod->m_dmagic_power = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner"); + basemod->m_dwillpower = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner"); - basemod->m_dresistances[Damage::PHYSICAL] = (int) getSpinnerValue("ItemTab/Equip/PhysResSpinner"); - basemod->m_dresistances[Damage::FIRE] = (int) getSpinnerValue("ItemTab/Equip/FireResSpinner"); - basemod->m_dresistances[Damage::ICE] = (int) getSpinnerValue("ItemTab/Equip/IceResSpinner"); - basemod->m_dresistances[Damage::AIR] = (int) getSpinnerValue("ItemTab/Equip/AirResSpinner"); + basemod->m_dresistances[Damage::PHYSICAL] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner"); + basemod->m_dresistances[Damage::FIRE] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner"); + basemod->m_dresistances[Damage::ICE] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner"); + basemod->m_dresistances[Damage::AIR] = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner"); - basemod->m_darmor = (int) getSpinnerValue("ItemTab/Equip/ArmorSpinner"); - basemod->m_dblock = (int) getSpinnerValue("ItemTab/Equip/BlockSpinner"); - basemod->m_dattack = (int) getSpinnerValue("ItemTab/Equip/AttackSpinner"); - basemod->m_dpower = (int) getSpinnerValue("ItemTab/Equip/PowerSpinner"); + basemod->m_darmor = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner"); + basemod->m_dblock = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner"); + basemod->m_dattack = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner"); + basemod->m_dpower = (int) getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner"); m_no_cegui_events = false; @@ -411,7 +539,8 @@ bool ItemEditor::onItemXMLModified(const CEGUI::EventArgs& evt) { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("ItemTab/XML/ItemXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/ItemXMLEditbox")); // Parse the editor text to XML // use temporary XML document for recovering from errors @@ -447,7 +576,7 @@ int err_row = item_temp_xml.ErrorRow(); int err_col = item_temp_xml.ErrorCol(); - setMultiLineEditboxCursor("ItemTab/XML/ItemXMLEditbox",err_row,err_col); + setMultiLineEditboxCursor("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/ItemXMLEditbox",err_row,err_col); } return true; @@ -533,7 +662,8 @@ #endif item_rt->update(); - CEGUI::Window* label = CEGUIUtility::getWindow("ItemTab/BM/itemPreview"); + CEGUI::Window* label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/BM/itemPreview"); // reparse and update the FixedObject Data // create a unique renderinfo (to avoid that the object is modified by the editor after creation) @@ -576,7 +706,7 @@ m_item_xml.RootElement()->SetAttribute("subtype",plain_subtype.c_str()); item_image->SetAttribute("image",image.c_str()); - float magic = getSpinnerValue("ItemTab/Create/EnchantSpinner",0); + float magic = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Create/EnchantSpinner",0); Item::Type type = ItemFactory::getBaseType(subtype); Item* item = ItemFactory::createItem(type, subtype, 0, magic); return item; @@ -639,7 +769,7 @@ bool ItemEditor::onCopyData(const CEGUI::EventArgs& evt) { - std::string objname = getComboboxSelection("ItemTab/Properties/CopyDataBox", ""); + std::string objname = getComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/CopyDataBox", ""); if (objname == "") { return true; @@ -673,7 +803,8 @@ TiXmlPrinter printer; m_item_xml.Accept(&printer); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("ItemTab/XML/ItemXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/XML/ItemXMLEditbox")); editor->setText(printer.CStr()); } @@ -681,57 +812,57 @@ { m_no_cegui_events = true; - setSpinnerValue("ItemTab/General/PriceSpinner",m_edited_item.m_price); - setSpinnerValue("ItemTab/General/EnchantMinSpinner",m_edited_item.m_min_enchant); - setSpinnerValue("ItemTab/General/EnchantMaxSpinner",m_edited_item.m_max_enchant); - setWindowText("ItemTab/General/NameBox",m_edited_item.m_name); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/PriceSpinner",m_edited_item.m_price); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMinSpinner",m_edited_item.m_min_enchant); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/EnchantMaxSpinner",m_edited_item.m_max_enchant); + setWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/NameBox",m_edited_item.m_name); Item::Type type = m_edited_item.m_type; - if (type == Item::ARMOR) setComboboxSelection("ItemTab/Properties/TypeBox","Armor"); - else if (type == Item::WEAPON) setComboboxSelection("ItemTab/Properties/TypeBox","Weapon"); - else if (type == Item::HELMET) setComboboxSelection("ItemTab/Properties/TypeBox","Helmet"); - else if (type == Item::GLOVES) setComboboxSelection("ItemTab/Properties/TypeBox","Gloves"); - else if (type == Item::RING) setComboboxSelection("ItemTab/Properties/TypeBox","Ring"); - else if (type == Item::AMULET) setComboboxSelection("ItemTab/Properties/TypeBox","Amulet"); - else if (type == Item::SHIELD) setComboboxSelection("ItemTab/Properties/TypeBox","Shield"); - else if (type == Item::POTION) setComboboxSelection("ItemTab/Properties/TypeBox","Potion"); + if (type == Item::ARMOR) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Armor"); + else if (type == Item::WEAPON) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Weapon"); + else if (type == Item::HELMET) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Helmet"); + else if (type == Item::GLOVES) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Gloves"); + else if (type == Item::RING) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Ring"); + else if (type == Item::AMULET) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Amulet"); + else if (type == Item::SHIELD) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Shield"); + else if (type == Item::POTION) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/General/TypeBox", "Potion"); Item::Size size = m_edited_item.m_size; - if (size == Item::BIG) setComboboxSelection("ItemTab/Properties/SizeBox","Big"); - else if (size == Item::MEDIUM) setComboboxSelection("ItemTab/Properties/SizeBox","Medium"); - else if (size == Item::SMALL) setComboboxSelection("ItemTab/Properties/SizeBox","Small"); + if (size == Item::BIG) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox","Big"); + else if (size == Item::MEDIUM) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox","Medium"); + else if (size == Item::SMALL) setComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Properties/SizeBox","Small"); // update weapon properties if (m_edited_item.m_weapon_attr != 0) { Damage& dmg = m_edited_item.m_weapon_attr->m_damage; - setWindowText("ItemTab/Weapon/TypeBox",m_edited_item.m_weapon_attr->m_weapon_type); + setWindowText("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TypeBox",m_edited_item.m_weapon_attr->m_weapon_type); - setSpinnerValue("ItemTab/Weapon/PhysMinSpinner",dmg.m_min_damage[Damage::PHYSICAL]); - setSpinnerValue("ItemTab/Weapon/PhysMaxSpinner",dmg.m_max_damage[Damage::PHYSICAL]); - setSpinnerValue("ItemTab/Weapon/PhysMultSpinner",dmg.m_multiplier[Damage::PHYSICAL]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMinSpinner",dmg.m_min_damage[Damage::PHYSICAL]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMaxSpinner",dmg.m_max_damage[Damage::PHYSICAL]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PhysMultSpinner",dmg.m_multiplier[Damage::PHYSICAL]); - setSpinnerValue("ItemTab/Weapon/FireMinSpinner",dmg.m_min_damage[Damage::FIRE]); - setSpinnerValue("ItemTab/Weapon/FireMaxSpinner",dmg.m_max_damage[Damage::FIRE]); - setSpinnerValue("ItemTab/Weapon/FireMultSpinner",dmg.m_multiplier[Damage::FIRE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMinSpinner",dmg.m_min_damage[Damage::FIRE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMaxSpinner",dmg.m_max_damage[Damage::FIRE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/FireMultSpinner",dmg.m_multiplier[Damage::FIRE]); - setSpinnerValue("ItemTab/Weapon/IceMinSpinner",dmg.m_min_damage[Damage::ICE]); - setSpinnerValue("ItemTab/Weapon/IceMaxSpinner",dmg.m_max_damage[Damage::ICE]); - setSpinnerValue("ItemTab/Weapon/IceMultSpinner",dmg.m_multiplier[Damage::ICE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMinSpinner",dmg.m_min_damage[Damage::ICE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMaxSpinner",dmg.m_max_damage[Damage::ICE]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/IceMultSpinner",dmg.m_multiplier[Damage::ICE]); - setSpinnerValue("ItemTab/Weapon/AirMinSpinner",dmg.m_min_damage[Damage::AIR]); - setSpinnerValue("ItemTab/Weapon/AirMaxSpinner",dmg.m_max_damage[Damage::AIR]); - setSpinnerValue("ItemTab/Weapon/AirMultSpinner",dmg.m_multiplier[Damage::AIR]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMinSpinner",dmg.m_min_damage[Damage::AIR]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMaxSpinner",dmg.m_max_damage[Damage::AIR]); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/AirMultSpinner",dmg.m_multiplier[Damage::AIR]); - setSpinnerValue("ItemTab/Weapon/PrecisionSpinner",dmg.m_attack); - setSpinnerValue("ItemTab/Weapon/PowerSpinner",dmg.m_power); - setSpinnerValue("ItemTab/Weapon/CritPercentSpinner",dmg.m_crit_perc*100); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PrecisionSpinner",dmg.m_attack); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/PowerSpinner",dmg.m_power); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/CritPercentSpinner",dmg.m_crit_perc*100); - setSpinnerValue("ItemTab/Weapon/RangeSpinner",m_edited_item.m_weapon_attr->m_attack_range); - setSpinnerValue("ItemTab/Weapon/SpeedSpinner",m_edited_item.m_weapon_attr->m_dattack_speed ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/RangeSpinner",m_edited_item.m_weapon_attr->m_attack_range); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/SpeedSpinner",m_edited_item.m_weapon_attr->m_dattack_speed ); - setCheckboxSelected("ItemTab/Weapon/TwohandedCheckbox", m_edited_item.m_weapon_attr->m_two_handed); + setCheckboxSelected("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Weapon/TwohandedCheckbox", m_edited_item.m_weapon_attr->m_two_handed); } @@ -739,37 +870,37 @@ { CreatureDynAttrMod* dynmod = m_edited_item.m_useup_effect; - setSpinnerValue("ItemTab/Consume/HealthSpinner", dynmod->m_dhealth); - setSpinnerValue("ItemTab/Consume/BlindSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BLIND] ); - setSpinnerValue("ItemTab/Consume/PoisonedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::POISONED] ); - setSpinnerValue("ItemTab/Consume/BerserkSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BERSERK] ); - setSpinnerValue("ItemTab/Consume/ConfusedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::CONFUSED] ); - setSpinnerValue("ItemTab/Consume/MuteSpinner",dynmod->m_dstatus_mod_immune_time[Damage::MUTE] ); - setSpinnerValue("ItemTab/Consume/ParalyzedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::PARALYZED] ); - setSpinnerValue("ItemTab/Consume/FrozenSpinner",dynmod->m_dstatus_mod_immune_time[Damage::FROZEN] ); - setSpinnerValue("ItemTab/Consume/BurningSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BURNING] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/HealthSpinner", dynmod->m_dhealth); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BlindSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BLIND] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/PoisonedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::POISONED] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BerserkSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BERSERK] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ConfusedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::CONFUSED] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/MuteSpinner",dynmod->m_dstatus_mod_immune_time[Damage::MUTE] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/ParalyzedSpinner",dynmod->m_dstatus_mod_immune_time[Damage::PARALYZED] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/FrozenSpinner",dynmod->m_dstatus_mod_immune_time[Damage::FROZEN] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Consume/BurningSpinner",dynmod->m_dstatus_mod_immune_time[Damage::BURNING] ); } if (m_edited_item.m_equip_effect != 0) { CreatureBaseAttrMod* basemod = m_edited_item.m_equip_effect; - setSpinnerValue("ItemTab/Equip/HealthSpinner",basemod->m_dmax_health ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/HealthSpinner",basemod->m_dmax_health ); - setSpinnerValue("ItemTab/Equip/StrengthSpinner",basemod->m_dstrength ); - setSpinnerValue("ItemTab/Equip/DexteritySpinner",basemod->m_ddexterity ); - setSpinnerValue("ItemTab/Equip/MagicPowerSpinner",basemod->m_dmagic_power ); - setSpinnerValue("ItemTab/Equip/WillpowerSpinner",basemod->m_dwillpower ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/StrengthSpinner",basemod->m_dstrength ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/DexteritySpinner",basemod->m_ddexterity ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/MagicPowerSpinner",basemod->m_dmagic_power ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/WillpowerSpinner",basemod->m_dwillpower ); - setSpinnerValue("ItemTab/Equip/PhysResSpinner",basemod->m_dresistances[Damage::PHYSICAL] ); - setSpinnerValue("ItemTab/Equip/FireResSpinner",basemod->m_dresistances[Damage::FIRE] ); - setSpinnerValue("ItemTab/Equip/IceResSpinner",basemod->m_dresistances[Damage::ICE] ); - setSpinnerValue("ItemTab/Equip/AirResSpinner",basemod->m_dresistances[Damage::AIR] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PhysResSpinner",basemod->m_dresistances[Damage::PHYSICAL] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/FireResSpinner",basemod->m_dresistances[Damage::FIRE] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/IceResSpinner",basemod->m_dresistances[Damage::ICE] ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AirResSpinner",basemod->m_dresistances[Damage::AIR] ); - setSpinnerValue("ItemTab/Equip/ArmorSpinner",basemod->m_darmor ); - setSpinnerValue("ItemTab/Equip/BlockSpinner",basemod->m_dblock ); - setSpinnerValue("ItemTab/Equip/AttackSpinner",basemod->m_dattack ); - setSpinnerValue("ItemTab/Equip/PowerSpinner",basemod->m_dpower ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/ArmorSpinner",basemod->m_darmor ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/BlockSpinner",basemod->m_dblock ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/AttackSpinner",basemod->m_dattack ); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/ItemTab/ItemTabControl/__auto_TabPane__/Equip/PowerSpinner",basemod->m_dpower ); }
--- a/src/gui/contenteditor/monstereditor.cpp Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/monstereditor.cpp Sat Mar 29 00:41:42 2014 +0200 @@ -36,13 +36,15 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("MonsterTab/Prop/RadiusSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Properties/RadiusSpinner")); radiusSpinner->subscribeEvent(CEGUI::Spinner::EventValueChanged, CEGUI::Event::Subscriber(&MonsterEditor::onMonsterModified, this)); /* - CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("MonsterTab/Prop/LayerSelector")); + CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Prop/LayerSelector")); layerSelector->addItem(new CEGUI::ListboxTextItem("Normal")); layerSelector->addItem(new CEGUI::ListboxTextItem("Base")); layerSelector->addItem(new CEGUI::ListboxTextItem("Air")); @@ -51,19 +53,24 @@ layerSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&MonsterEditor::onMonsterModified, this)); */ - CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("MonsterTab/XML/SubmitButton")); + CEGUI::PushButton* xmlsubmitButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/XML/SubmitButton")); xmlsubmitButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&MonsterEditor::onMonsterXMLModified, this)); - CEGUI::PushButton* createFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("MonsterTab/XML/CreateButton")); + CEGUI::PushButton* createFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/CreateButton")); createFOButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&MonsterEditor::onMonsterCreate, this)); - CEGUI::PushButton* delallFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("MonsterTab/Create/DelAllButton")); + CEGUI::PushButton* delallFOButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/DelAllButton")); delallFOButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&MonsterEditor::onDelAllObjects, this)); - CEGUI::PushButton* getplayerButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("MonsterTab/Create/GetPlPosButton")); + CEGUI::PushButton* getplayerButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/GetPlPosButton")); getplayerButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&MonsterEditor::onGetPlayerPosition, this)); - CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("MonsterTab/Properties/CopyDataButton")); + CEGUI::PushButton* copyfoButton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Properties/CopyDataButton")); copyfoButton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&MonsterEditor::onCopyData, this)); // init the internal data @@ -104,7 +111,8 @@ { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* copyfoSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("MonsterTab/Properties/CopyDataBox")); + CEGUI::Combobox* copyfoSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Properties/CopyDataBox")); // Fill list of all Monsters const std::map<GameObject::Subtype, MonsterBasicData*>& all_fo = ObjectFactory::getAllMonsterData(); @@ -126,7 +134,8 @@ TiXmlPrinter printer; m_monster_xml.Accept(&printer); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("MonsterTab/XML/MonsterXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/XML/MonsterXMLEditbox")); editor->setText(printer.CStr()); } @@ -136,9 +145,11 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); /* - CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("MonsterTab/Prop/LayerSelector")); + CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Prop/LayerSelector")); */ - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("MonsterTab/Prop/RadiusSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Prop/RadiusSpinner")); // adjust the spinner values radiusSpinner->setCurrentValue(m_edited_monster.m_radius); @@ -172,9 +183,11 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("MonsterTab/Prop/RadiusSpinner")); + CEGUI::Spinner* radiusSpinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Prop/RadiusSpinner")); - //CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("MonsterTab/Prop/LayerSelector")); + //CEGUI::Combobox* layerSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + // "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Prop/LayerSelector")); m_edited_monster.m_radius = radiusSpinner->getCurrentValue(); @@ -199,7 +212,8 @@ bool MonsterEditor::onMonsterXMLModified(const CEGUI::EventArgs& evt) { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("MonsterTab/XML/MonsterXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/XML/MonsterXMLEditbox")); // Parse the editor text to XML // use temporary XML document for recovering from errors @@ -234,7 +248,10 @@ int err_row = ri_temp_xml.ErrorRow(); int err_col = ri_temp_xml.ErrorCol(); - setMultiLineEditboxCursor("MonsterTab/XML/MonsterXMLEditbox",err_row,err_col); + setMultiLineEditboxCursor( + "Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/XML/MonsterXMLEditbox", + err_row, + err_col); } return true; @@ -273,9 +290,9 @@ Region* region = player->getRegion(); // if the position is set to default, use the player position - pos.m_x = getSpinnerValue("MonsterTab/Create/PosXSpinner",0); - pos.m_y = getSpinnerValue("MonsterTab/Create/PosYSpinner",0); - angle = getSpinnerValue("MonsterTab/Create/AngleSpinner",0); + pos.m_x = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/PosXSpinner",0); + pos.m_y = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/PosYSpinner",0); + angle = getSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/AngleSpinner",0); if (pos.m_x == 0 && pos.m_y == 0) { pos = player->getShape()->m_center; @@ -290,7 +307,7 @@ bool MonsterEditor::onCopyData(const CEGUI::EventArgs& evt) { - std::string objname = getComboboxSelection("MonsterTab/Properties/CopyDataBox", ""); + std::string objname = getComboboxSelection("Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Properties/CopyDataBox", ""); if (objname == "") return true; @@ -319,8 +336,8 @@ Vector pos = player->getShape()->m_center; - setSpinnerValue("MonsterTab/Create/PosXSpinner", pos.m_x); - setSpinnerValue("MonsterTab/Create/PosYSpinner", pos.m_y); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/PosXSpinner", pos.m_x); + setSpinnerValue("Root/ObjectInfoTabControl/__auto_TabPane__/MonsterTab/MonsterTabControl/__auto_TabPane__/Create/PosYSpinner", pos.m_y); return true; }
--- a/src/gui/contenteditor/renderinfoeditor.cpp Fri Mar 28 00:33:23 2014 +0200 +++ b/src/gui/contenteditor/renderinfoeditor.cpp Sat Mar 29 00:41:42 2014 +0200 @@ -37,8 +37,10 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); // add parts to the mesh selectors - CEGUI::Combobox* selector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/BM/MeshSelector")); - CEGUI::Combobox* subSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/Selector")); + CEGUI::Combobox* selector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/BasicMesh/MeshSelector")); + CEGUI::Combobox* subSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/Selector")); Ogre::FileInfoListPtr files; Ogre::FileInfoList::iterator it; @@ -74,30 +76,44 @@ selector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&RenderInfoEditor::onMeshSelected, this)); subSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&RenderInfoEditor::onSubMeshSelected, this)); - CEGUI::PushButton* addSubmeshbutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("RITab/SubMesh/AddSubMeshButton")); + CEGUI::PushButton* addSubmeshbutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AddSubMeshButton")); addSubmeshbutton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&RenderInfoEditor::onSubMeshAdded, this)); - CEGUI::PushButton* submitRIXMLbutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("RITab/XML/SubmitButton")); + CEGUI::PushButton* submitRIXMLbutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/XML/SubmitButton")); submitRIXMLbutton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&RenderInfoEditor::onRenderinfoXMLModified, this)); - CEGUI::PushButton* delSubmeshbutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindow("RITab/SubMesh/DelSubMeshButton")); + CEGUI::PushButton* delSubmeshbutton = static_cast<CEGUI::PushButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/DelSubMeshButton")); delSubmeshbutton->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&RenderInfoEditor::onSubMeshDeleted, this)); - CEGUI::Spinner* rotXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateX")); - CEGUI::Spinner* rotYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateY")); - CEGUI::Spinner* rotZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateZ")); + CEGUI::Spinner* rotXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateX")); + CEGUI::Spinner* rotYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateY")); + CEGUI::Spinner* rotZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateZ")); - CEGUI::Spinner* posXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetX")); - CEGUI::Spinner* posYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetY")); - CEGUI::Spinner* posZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetZ")); + CEGUI::Spinner* posXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetX")); + CEGUI::Spinner* posYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetY")); + CEGUI::Spinner* posZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetZ")); - CEGUI::Spinner* scalespinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMScale")); + CEGUI::Spinner* scalespinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMScale")); - CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/EditSMSelector")); - CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/AttachMeshSelector")); - CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/BoneSelector")); - CEGUIUtility::ToggleButton* attachCheckbox = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindow("RITab/SM/AttachSMCheckbox")); + CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/EditSMSelector")); + CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachMeshSelector")); + CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/BoneSelector")); + CEGUIUtility::ToggleButton* attachCheckbox = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachSMCheckbox")); objSelector->subscribeEvent(CEGUI::Combobox::EventListSelectionAccepted, CEGUI::Event::Subscriber(&RenderInfoEditor::onSubObjectSelected, this)); @@ -251,20 +267,31 @@ { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Spinner* rotXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateX")); - CEGUI::Spinner* rotYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateY")); - CEGUI::Spinner* rotZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateZ")); + CEGUI::Spinner* rotXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateX")); + CEGUI::Spinner* rotYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateY")); + CEGUI::Spinner* rotZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateZ")); - CEGUI::Spinner* posXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetX")); - CEGUI::Spinner* posYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetY")); - CEGUI::Spinner* posZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetZ")); + CEGUI::Spinner* posXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetX")); + CEGUI::Spinner* posYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetY")); + CEGUI::Spinner* posZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetZ")); - CEGUI::Spinner* scalespinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMScale")); + CEGUI::Spinner* scalespinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMScale")); - CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/EditSMSelector")); - CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/AttachMeshSelector")); - CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/BoneSelector")); - CEGUIUtility::ToggleButton* attachCheckbox = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindow("RITab/SM/AttachSMCheckbox")); + CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/EditSMSelector")); + CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachMeshSelector")); + CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/BoneSelector")); + CEGUIUtility::ToggleButton* attachCheckbox = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachSMCheckbox")); if (objectname == "") objectname = objSelector->getText().c_str(); @@ -432,8 +459,10 @@ void RenderInfoEditor::updateBoneList() { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/BoneSelector")); - CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/AttachMeshSelector")); + CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/BoneSelector")); + CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachMeshSelector")); // get the selected object and the underlying RenderInfo data structure std::string boneobj = boneobjSelector->getText().c_str(); @@ -507,7 +536,8 @@ TiXmlPrinter printer; m_renderinfo_xml.Accept(&printer); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("RITab/XML/RIXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/XML/RIXMLEditbox")); editor->setText(printer.CStr()); } @@ -583,8 +613,10 @@ bool RenderInfoEditor::onSubMeshSelected(const CEGUI::EventArgs& evt) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* subSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/Selector")); - CEGUI::Editbox* subMeshNameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindow("RITab/SM/SMNameEditbox")); + CEGUI::Combobox* subSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/Selector")); + CEGUI::Editbox* subMeshNameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMNameEditbox")); CEGUI::ListboxItem* item = subSelector->getSelectedItem(); if (item != 0) @@ -605,8 +637,10 @@ bool RenderInfoEditor::onSubMeshAdded(const CEGUI::EventArgs& evt) { //CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* subSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/Selector")); - CEGUI::Editbox* subMeshNameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindow("RITab/SM/SMNameEditbox")); + CEGUI::Combobox* subSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/Selector")); + CEGUI::Editbox* subMeshNameBox = static_cast<CEGUI::Editbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMNameEditbox")); CEGUI::ListboxItem* item = subSelector->getSelectedItem(); if (item != 0) @@ -662,20 +696,31 @@ CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); // the the GUI parts - CEGUI::Spinner* rotXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateX")); - CEGUI::Spinner* rotYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateY")); - CEGUI::Spinner* rotZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMRotateZ")); + CEGUI::Spinner* rotXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateX")); + CEGUI::Spinner* rotYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateY")); + CEGUI::Spinner* rotZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMRotateZ")); - CEGUI::Spinner* posXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetX")); - CEGUI::Spinner* posYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetY")); - CEGUI::Spinner* posZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMOffsetZ")); + CEGUI::Spinner* posXspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetX")); + CEGUI::Spinner* posYspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetY")); + CEGUI::Spinner* posZspinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMOffsetZ")); - CEGUI::Spinner* scalespinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindow("RITab/SM/SMScale")); + CEGUI::Spinner* scalespinner = static_cast<CEGUI::Spinner*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/SMScale")); - CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/EditSMSelector")); - CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/AttachMeshSelector")); - CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/BoneSelector")); - CEGUIUtility::ToggleButton* attachCheckbox = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindow("RITab/SM/AttachSMCheckbox")); + CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/EditSMSelector")); + CEGUI::Combobox* boneobjSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachMeshSelector")); + CEGUI::Combobox* boneSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/BoneSelector")); + CEGUIUtility::ToggleButton* attachCheckbox = static_cast<CEGUIUtility::ToggleButton*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/AttachSMCheckbox")); // get the MovableObjectInfo CEGUI::ListboxItem* item = objSelector->getSelectedItem(); @@ -738,7 +783,8 @@ return true; CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindow("RITab/SubMesh/EditSMSelector")); + CEGUI::Combobox* objSelector = static_cast<CEGUI::Combobox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/SubMesh/EditSMSelector")); // get the MovableObjectInfo CEGUI::ListboxItem* item = objSelector->getSelectedItem(); @@ -759,7 +805,8 @@ bool RenderInfoEditor::onRenderinfoXMLModified(const CEGUI::EventArgs& evt) { CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton(); - CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindow("RITab/XML/RIXMLEditbox")); + CEGUI::MultiLineEditbox* editor = static_cast<CEGUI::MultiLineEditbox*>(CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, + "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/RenderInfoTabControl/__auto_TabPane__/XML/RIXMLEditbox")); // Parse the editor text to XML // use temporary XML document for recovering from errors