Mercurial > sumwars

changeset 2696:287738b8843e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refs #29: Corrected some paths used to access CEGUI objects. Still need to hide debug window. Reordered the cmakelists items alphabetically and added headers.
author Augustin Preda
date Sat, 29 Mar 2014 11:31:47 +0200
parents 29a269dc5fd3
children bc830ff16037 78b5adbf95ac
files CMakeLists.txt share/resources/gui_0.8/layouts/contenteditor.layout src/gui/contenteditor/contenteditor.cpp src/gui/contenteditor/guitabs.cpp src/gui/contenteditor/guitabs.h src/gui/contenteditor/itemeditor.cpp src/gui/debugpanel/debugcameratab.cpp src/gui/worldmap.cpp
diffstat 8 files changed, 220 insertions(+), 300 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Sat Mar 29 00:41:42 2014 +0200
+++ b/CMakeLists.txt	Sat Mar 29 11:31:47 2014 +0200
@@ -403,38 +403,72 @@
     )
 
 SET(SRCS_GUI
-  ./src/gui/minimapwindow.cpp
-  ./src/gui/worldmap.cpp
-  ./src/gui/mainmenu.cpp
+  ./src/gui/application.cpp
+  ./src/gui/application.h
+  ./src/gui/ceguiutility.cpp
+  ./src/gui/ceguiutility.h
   ./src/gui/charcreate.cpp
-  ./src/gui/ceguiutility.cpp
-  ./src/gui/tooltipmanager.cpp
+  ./src/gui/charcreate.h
+  ./src/gui/charinfo.cpp
+  ./src/gui/charinfo.h
+  ./src/gui/chatline.cpp
+  ./src/gui/chatline.h
+  ./src/gui/clipboard.cpp
+  ./src/gui/clipboard.h
   ./src/gui/controlpanel.cpp
+  ./src/gui/controlpanel.h
+  ./src/gui/creditswindow.cpp
+  ./src/gui/creditswindow.h
+  ./src/gui/dialoguewindow.cpp
+  ./src/gui/dialoguewindow.h
+  ./src/gui/graphicmanager.cpp
+  ./src/gui/graphicmanager.h
+  ./src/gui/graphicobject.cpp
+  ./src/gui/graphicobject.h
+  ./src/gui/graphicobjectrenderinfo.cpp
+  ./src/gui/graphicobjectrenderinfo.h
   ./src/gui/inventory.cpp
-  ./src/gui/tradewindow.cpp
-  ./src/gui/dialoguewindow.cpp
-  ./src/gui/partyinfo.cpp
+  ./src/gui/inventory.h
+  ./src/gui/itemwindow.cpp
+  ./src/gui/itemwindow.h
+  ./src/gui/listitem.h
+  ./src/gui/main_gui.cpp
+  ./src/gui/mainmenu.cpp
+  ./src/gui/mainmenu.h
+  ./src/gui/mainwindow.cpp
+  ./src/gui/mainwindow.h
+  ./src/gui/messageboxes.cpp
+  ./src/gui/messageboxes.h
+  ./src/gui/minimapwindow.cpp
+  ./src/gui/minimapwindow.h
   ./src/gui/networkwindows.cpp
-  ./src/gui/creditswindow.cpp
-  ./src/gui/mainwindow.cpp
-  ./src/gui/application.cpp
+  ./src/gui/networkwindows.h
+  ./src/gui/optionswindow.cpp
+  ./src/gui/optionswindow.h
+  ./src/gui/partyinfo.cpp
+  ./src/gui/partyinfo.h
+  ./src/gui/questinfo.cpp
+  ./src/gui/questinfo.h
+  ./src/gui/savegamelist.cpp
+  ./src/gui/savegamelist.h
+  ./src/gui/scene.cpp
+  ./src/gui/scene.h
   ./src/gui/skilltree.cpp
-  ./src/gui/chatline.cpp
-  ./src/gui/charinfo.cpp
-  ./src/gui/itemwindow.cpp
-  ./src/gui/savegamelist.cpp
-  ./src/gui/scene.cpp
-  ./src/gui/graphicmanager.cpp
-  ./src/gui/main_gui.cpp
-  ./src/gui/messageboxes.cpp
-  ./src/gui/graphicobjectrenderinfo.cpp
-  ./src/gui/graphicobject.cpp
-  ./src/gui/questinfo.cpp
+  ./src/gui/skilltree.h
   ./src/gui/soundhelper.cpp
+  ./src/gui/soundhelper.h
   ./src/gui/soundobject.cpp
+  ./src/gui/soundobject.h
   ./src/gui/tooltip.cpp
-  ./src/gui/optionswindow.cpp
-  ./src/gui/clipboard.cpp
+  ./src/gui/tooltip.h
+  ./src/gui/tooltipmanager.cpp
+  ./src/gui/tooltipmanager.h
+  ./src/gui/tooltipsettings.h
+  ./src/gui/tradewindow.cpp
+  ./src/gui/tradewindow.h
+  ./src/gui/window.h
+  ./src/gui/worldmap.cpp
+  ./src/gui/worldmap.h
 #   ./src/gui/ShaderManager.cpp
 #   ./src/gui/ShadowCameraSetup.cpp
     )    
@@ -457,27 +491,47 @@
 )
  
 IF(SUMWARS_BUILD_TOOLS)
-  SET(SRCS_BUILD_TOOLS
+  SET(SRCS_BUILD_TOOLS_DBG_PANEL
     ./src/gui/debugpanel/benchmarktab.cpp
-    ./src/gui/debugpanel/debugpanel.cpp
+    ./src/gui/debugpanel/benchmarktab.h
     ./src/gui/debugpanel/debugcameratab.cpp
-    ./src/gui/debugpanel/iconeditortab.cpp
+    ./src/gui/debugpanel/debugcameratab.h
+    ./src/gui/debugpanel/debugpanel.cpp
+    ./src/gui/debugpanel/debugpanel.h
     ./src/gui/debugpanel/guidebugtab.cpp
+    ./src/gui/debugpanel/guidebugtab.h
+    ./src/gui/debugpanel/iconeditortab.cpp
+    ./src/gui/debugpanel/iconeditortab.h
     ./src/gui/debugpanel/luascripttab.cpp
+    ./src/gui/debugpanel/luascripttab.h
     ./src/gui/debugpanel/textfileeditwindow.cpp
+    ./src/gui/debugpanel/textfileeditwindow.h
     ./src/gui/debugpanel/filebrowser/filebrowser.cpp
+    ./src/gui/debugpanel/filebrowser/filebrowser.h
+    )
+  SET(SRCS_BUILD_TOOLS_CONTENT_EDITOR
     ./src/gui/contenteditor/contenteditor.cpp
+    ./src/gui/contenteditor/contenteditor.h
     ./src/gui/contenteditor/contenteditortab.cpp
+    ./src/gui/contenteditor/contenteditortab.h
+    ./src/gui/contenteditor/contenttab.h
     ./src/gui/contenteditor/fixedobjecteditor.cpp
-    ./src/gui/contenteditor/renderinfoeditor.cpp
+    ./src/gui/contenteditor/fixedobjecteditor.h
+    ./src/gui/contenteditor/gameinfotab.cpp
+    ./src/gui/contenteditor/gameinfotab.h
     ./src/gui/contenteditor/itemeditor.cpp
+    ./src/gui/contenteditor/itemeditor.h
     ./src/gui/contenteditor/monstereditor.cpp
-    ./src/gui/contenteditor/gameinfotab.cpp
+    ./src/gui/contenteditor/monstereditor.h
+    ./src/gui/contenteditor/renderinfoeditor.cpp
+    ./src/gui/contenteditor/renderinfoeditor.h
     )
-  SOURCE_GROUP ("tools" FILES ${SRCS_BUILD_TOOLS})
+  SOURCE_GROUP ("tools\\dbgpanel" FILES ${SRCS_BUILD_TOOLS_DBG_PANEL})
+  SOURCE_GROUP ("tools\\contedit" FILES ${SRCS_BUILD_TOOLS_CONTENT_EDITOR})
   SET(SRCS
     ${SRCS}
-    ${SRCS_BUILD_TOOLS}
+    ${SRCS_BUILD_TOOLS_DBG_PANEL}
+    ${SRCS_BUILD_TOOLS_CONTENT_EDITOR}
     )
 ENDIF()
 
--- a/share/resources/gui_0.8/layouts/contenteditor.layout	Sat Mar 29 00:41:42 2014 +0200
+++ b/share/resources/gui_0.8/layouts/contenteditor.layout	Sat Mar 29 11:31:47 2014 +0200
@@ -24,8 +24,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="MainMeshLabel" >
                             <Property name="Text" value="Select main mesh:" />
-                            <Property name="HorzExtent" value="115" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03739,0},{0.0186585,0},{0.327415,0},{0.0879001,0}}" />
                         </Window>
@@ -44,22 +42,16 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="NewSubmeshLabel" >
                             <Property name="Text" value="New submesh:" />
-                            <Property name="HorzExtent" value="91" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.022898,0},{0.238785,0},{0.068202,0}}" />
                         </Window>
                         <Window type="TaharezLook/StaticText" name="NewSMNameLabel" >
                             <Property name="Text" value="submesh name:" />
-                            <Property name="HorzExtent" value="97" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.0270315,0},{0.0721111,0},{0.243158,0},{0.127415,0}}" />
                         </Window>
                         <Window type="TaharezLook/StaticText" name="EditSMLabel" >
                             <Property name="Text" value="Edit submesh:" />
-                            <Property name="HorzExtent" value="86" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.0232801,0},{0.181441,0},{0.249406,0},{0.236745,0}}" />
                         </Window>
@@ -69,8 +61,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="AttachMeshLabel" >
                             <Property name="Text" value="Attach to:" />
-                            <Property name="HorzExtent" value="61" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.08,0},{0.228963,0},{0.259419,0},{0.304266,0}}" />
                         </Window>
@@ -80,8 +70,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="BoneLabel" >
                             <Property name="Text" value="at bone:" />
-                            <Property name="HorzExtent" value="51" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.57,0},{0.242082,0},{0.721903,0},{0.301351,0}}" />
                         </Window>
@@ -99,8 +87,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="RotateLabel" >
                             <Property name="Text" value="Rotate(x,y,z):" />
-                            <Property name="HorzExtent" value="84" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.02,0},{0.4,0},{0.219404,0},{0.46,0}}" />
                         </Window>
@@ -133,8 +119,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="ScaleLabel" >
                             <Property name="Text" value="Scale:" />
-                            <Property name="HorzExtent" value="37" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.02,0},{0.5,0},{0.22,0},{0.56,0}}" />
                         </Window>
@@ -149,8 +133,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="OffsetLabel" >
                             <Property name="Text" value="Offset (x,y,z):" />
-                            <Property name="HorzExtent" value="85" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.02,0},{0.6,0},{0.22,0},{0.66,0}}" />
                         </Window>
@@ -226,8 +208,6 @@
                         <Property name="Area" value="{{-0.00215884,0},{0,0},{0.997841,0},{1,0}}" />
                         <Window type="TaharezLook/StaticText" name="ShapeLabel" >
                             <Property name="Text" value="Shape:" />
-                            <Property name="HorzExtent" value="42" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.01,0},{0.347415,0},{0.1,0}}" />
                         </Window>
@@ -236,15 +216,11 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="CircleLabel" >
                             <Property name="Text" value="Circle" />
-                            <Property name="HorzExtent" value="37" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.1,0},{0.1,0},{0.2,0},{0.15,0}}" />
                         </Window>
                         <Window type="TaharezLook/StaticText" name="RadiusLabel" >
                             <Property name="Text" value="Radius:" />
-                            <Property name="HorzExtent" value="42" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.3,0},{0.1,0},{0.4,0},{0.15,0}}" />
                         </Window>
@@ -266,15 +242,11 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="RectangleLabel" >
                             <Property name="Text" value="Rectangle" />
-                            <Property name="HorzExtent" value="63" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.1,0},{0.2,0},{0.2,0},{0.25,0}}" />
                         </Window>
                         <Window type="TaharezLook/StaticText" name="WidthLabel" >
                             <Property name="Text" value="Width:" />
-                            <Property name="HorzExtent" value="38" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.3,0},{0.2,0},{0.4,0},{0.25,0}}" />
                         </Window>
@@ -289,8 +261,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="DepthLabel" >
                             <Property name="Text" value="Depth:" />
-                            <Property name="HorzExtent" value="42" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.3,0},{0.301493,0},{0.4,0},{0.351493,0}}" />
                         </Window>
@@ -309,8 +279,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="CollisionLabel" >
                             <Property name="Text" value="Collision type" />
-                            <Property name="HorzExtent" value="85" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.1,0},{0.4,0},{0.4,0},{0.45,0}}" />
                         </Window>
@@ -320,8 +288,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="CopyDataLabel" >
                             <Property name="Text" value="Copy data from:" />
-                            <Property name="HorzExtent" value="100" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.6,0},{0.3,0},{0.65,0}}" />
                         </Window>
@@ -343,8 +309,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="PosLabel" >
                             <Property name="Text" value="Position:" />
-                            <Property name="HorzExtent" value="53" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.05,0},{0.03,0},{0.22,0},{0.1,0}}" />
                         </Window>
@@ -368,8 +332,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="AngleLabel" >
                             <Property name="Text" value="Angle:" />
-                            <Property name="HorzExtent" value="39" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.2,0},{0.2,0},{0.28,0}}" />
                         </Window>
@@ -417,8 +379,6 @@
                         <Property name="Area" value="{{-0.00215884,0},{0,0},{0.997841,0},{1,0}}" />
                         <Window type="TaharezLook/StaticText" name="RadiusLabel" >
                             <Property name="Text" value="Radius:" />
-                            <Property name="HorzExtent" value="42" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.3,0},{0.1,0},{0.4,0},{0.15,0}}" />
                         </Window>
@@ -434,8 +394,6 @@
 
                         <Window type="TaharezLook/StaticText" name="CopyDataLabel" >
                             <Property name="Text" value="Copy data from:" />
-                            <Property name="HorzExtent" value="100" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.6,0},{0.3,0},{0.65,0}}" />
                         </Window>
@@ -457,8 +415,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="PosLabel" >
                             <Property name="Text" value="Position:" />
-                            <Property name="HorzExtent" value="53" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.05,0},{0.03,0},{0.22,0},{0.1,0}}" />
                         </Window>
@@ -482,8 +438,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="AngleLabel" >
                             <Property name="Text" value="Angle:" />
-                            <Property name="HorzExtent" value="39" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.2,0},{0.2,0},{0.28,0}}" />
                         </Window>
@@ -529,8 +483,6 @@
                         <Property name="Area" value="{{-0.00215884,0},{0,0},{0.997841,0},{1,0}}" />
                         <Window type="TaharezLook/StaticText" name="TypeLabel" >
                             <Property name="Text" value="Type:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.09,0},{0.2,0},{0.15,0}}" />
                         </Window>
@@ -540,8 +492,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="SizeLabel" >
                             <Property name="Text" value="Size:" />
-                            <Property name="HorzExtent" value="29" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.16,0},{0.2,0},{0.24,0}}" />
                         </Window>
@@ -551,8 +501,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="CopyDataLabel" >
                             <Property name="Text" value="Copy data from:" />
-                            <Property name="HorzExtent" value="100" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.6,0},{0.3,0},{0.65,0}}" />
                         </Window>
@@ -566,8 +514,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="NameLabel" >
                             <Property name="Text" value="Name:" />
-                            <Property name="HorzExtent" value="41" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" />
                         </Window>
@@ -578,8 +524,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="PriceLabel" >
                             <Property name="Text" value="Value:" />
-                            <Property name="HorzExtent" value="38" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.25,0},{0.2,0},{0.3,0}}" />
                         </Window>
@@ -592,8 +536,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="EnchantRangeLabel" >
                             <Property name="Text" value="Enchant min:" />
-                            <Property name="HorzExtent" value="82" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.34,0},{0.24,0},{0.4,0}}" />
                         </Window>
@@ -606,8 +548,6 @@
                         </Window>
                         <Window type="TaharezLook/StaticText" name="EnchantMaxLabel" >
                             <Property name="Text" value="max:" />
-                            <Property name="HorzExtent" value="29" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.55,0},{0.34,0},{0.65,0},{0.4,0}}" />
                         </Window>
@@ -628,8 +568,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="HealthLabel" >
                             <Property name="Text" value="Health:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" />
                         </Window>
@@ -644,16 +582,12 @@
                         
                         <Window type="TaharezLook/StaticText" name="AttrLabel" >
                             <Property name="Text" value="Attribute:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.10,0},{0.2,0},{0.16,0}}" />
                         </Window>
                         
                         <Window type="TaharezLook/StaticText" name="StrengthLabel" >
                             <Property name="Text" value="Strength:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.17,0},{0.2,0},{0.23,0}}" />
                         </Window>
@@ -668,8 +602,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="DexterityLabel" >
                             <Property name="Text" value="Dexterity:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.17,0},{0.7,0},{0.23,0}}" />
                         </Window>
@@ -685,8 +617,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="MagicPowerLabel" >
                             <Property name="Text" value="Magic Power:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.24,0},{0.2,0},{0.30,0}}" />
                         </Window>
@@ -701,8 +631,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="WillpowerLabel" >
                             <Property name="Text" value="Willpower:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.24,0},{0.7,0},{0.30,0}}" />
                         </Window>
@@ -718,16 +646,12 @@
                         
                         <Window type="TaharezLook/StaticText" name="ResistancesLabel" >
                             <Property name="Text" value="Resistances:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.32,0},{0.4,0},{0.38,0}}" />
                         </Window>
                         
                         <Window type="TaharezLook/StaticText" name="PhysResLabel" >
                             <Property name="Text" value="Physical:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.39,0},{0.2,0},{0.45,0}}" />
                         </Window>
@@ -742,8 +666,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="FireResLabel" >
                             <Property name="Text" value="Fire:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.39,0},{0.7,0},{0.45,0}}" />
                         </Window>
@@ -758,8 +680,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="IceResLabel" >
                             <Property name="Text" value="Ice:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.46,0},{0.2,0},{0.52,0}}" />
                         </Window>
@@ -774,8 +694,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="AirResLabel" >
                             <Property name="Text" value="Air:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.46,0},{0.7,0},{0.52,0}}" />
                         </Window>
@@ -790,16 +708,12 @@
                         
                         <Window type="TaharezLook/StaticText" name="OtherLabel" >
                             <Property name="Text" value="Other:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.54,0},{0.2,0},{0.60,0}}" />
                         </Window>
                         
                         <Window type="TaharezLook/StaticText" name="ArmorLabel" >
                             <Property name="Text" value="Armor:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.61,0},{0.2,0},{0.67,0}}" />
                         </Window>
@@ -814,8 +728,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="BlockLabel" >
                             <Property name="Text" value="Block:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.61,0},{0.7,0},{0.67,0}}" />
                         </Window>
@@ -830,8 +742,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="AttackLabel" >
                             <Property name="Text" value="Precision:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.68,0},{0.2,0},{0.74,0}}" />
                         </Window>
@@ -846,8 +756,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="PowerLabel" >
                             <Property name="Text" value="Power:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.68,0},{0.7,0},{0.74,0}}" />
                         </Window>
@@ -869,8 +777,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="TypeLabel" >
                             <Property name="Text" value="Type:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" />
                         </Window>
@@ -883,16 +789,12 @@
                         
                         <Window type="TaharezLook/StaticText" name="DamageLabel" >
                             <Property name="Text" value="Damage:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.10,0},{0.2,0},{0.16,0}}" />
                         </Window>
                         
                         <Window type="TaharezLook/StaticText" name="PhysLabel" >
                             <Property name="Text" value="Physical:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.17,0},{0.2,0},{0.23,0}}" />
                         </Window>
@@ -907,8 +809,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="PhysToLabel" >
                             <Property name="Text" value="-" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.44,0},{0.17,0},{0.48,0},{0.23,0}}" />
                         </Window>
@@ -923,8 +823,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="PhysMultLabel" >
                             <Property name="Text" value="x" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.75,0},{0.17,0},{0.78,0},{0.23,0}}" />
                         </Window>
@@ -940,8 +838,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="FireLabel" >
                             <Property name="Text" value="Fire:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.24,0},{0.2,0},{0.30,0}}" />
                         </Window>
@@ -956,8 +852,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="FireToLabel" >
                             <Property name="Text" value="-" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.44,0},{0.24,0},{0.48,0},{0.30,0}}" />
                         </Window>
@@ -972,8 +866,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="FireMultLabel" >
                             <Property name="Text" value="x" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.75,0},{0.24,0},{0.78,0},{0.30,0}}" />
                         </Window>
@@ -989,8 +881,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="IceLabel" >
                             <Property name="Text" value="Ice:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.31,0},{0.2,0},{0.37,0}}" />
                         </Window>
@@ -1005,8 +895,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="IceToLabel" >
                             <Property name="Text" value="-" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.44,0},{0.31,0},{0.48,0},{0.37,0}}" />
                         </Window>
@@ -1021,8 +909,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="IceMultLabel" >
                             <Property name="Text" value="x" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.75,0},{0.31,0},{0.78,0},{0.37,0}}" />
                         </Window>
@@ -1039,8 +925,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="AirLabel" >
                             <Property name="Text" value="Air:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.38,0},{0.2,0},{0.44,0}}" />
                         </Window>
@@ -1055,8 +939,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="AirToLabel" >
                             <Property name="Text" value="-" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.44,0},{0.38,0},{0.48,0},{0.44,0}}" />
                         </Window>
@@ -1071,8 +953,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="AirMultLabel" >
                             <Property name="Text" value="x" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.75,0},{0.38,0},{0.78,0},{0.44,0}}" />
                         </Window>
@@ -1088,8 +968,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="PrecisionLabel" >
                             <Property name="Text" value="Precision:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.47,0},{0.2,0},{0.53,0}}" />
                         </Window>
@@ -1104,8 +982,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="PowerLabel" >
                             <Property name="Text" value="Power:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.53,0},{0.47,0},{0.7,0},{0.53,0}}" />
                         </Window>
@@ -1121,8 +997,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="RangeLabel" >
                             <Property name="Text" value="Range:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.54,0},{0.2,0},{0.60,0}}" />
                         </Window>
@@ -1138,8 +1012,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="SpeedLabel" >
                             <Property name="Text" value="Speed:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.53,0},{0.54,0},{0.7,0},{0.60,0}}" />
                         </Window>
@@ -1159,8 +1031,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="TwohandedLabel" >
                             <Property name="Text" value="Twohanded weapon" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.08,0},{0.61,0},{0.50,0},{0.67,0}}" />
                         </Window>
@@ -1168,8 +1038,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="CritPercentLabel" >
                             <Property name="Text" value="Crit. Hits:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.68,0},{0.2,0},{0.74,0}}" />
                         </Window>
@@ -1191,8 +1059,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="TypeLabel" >
                             <Property name="Text" value="Health:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.08,0}}" />
                         </Window>
@@ -1208,16 +1074,12 @@
                         
                         <Window type="TaharezLook/StaticText" name="CureLabel" >
                             <Property name="Text" value="Status heal and immunity time:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.10,0},{0.7,0},{0.16,0}}" />
                         </Window>
                         
                         <Window type="TaharezLook/StaticText" name="BlindLabel" >
                             <Property name="Text" value="Blind:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.17,0},{0.2,0},{0.23,0}}" />
                         </Window>
@@ -1232,8 +1094,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="PoisonedLabel" >
                             <Property name="Text" value="Poisoned:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.17,0},{0.7,0},{0.23,0}}" />
                         </Window>
@@ -1249,8 +1109,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="BerserkLabel" >
                             <Property name="Text" value="Berserk:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.24,0},{0.2,0},{0.30,0}}" />
                         </Window>
@@ -1265,8 +1123,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="ConfusedLabel" >
                             <Property name="Text" value="Confused:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.24,0},{0.7,0},{0.30,0}}" />
                         </Window>
@@ -1282,8 +1138,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="MuteLabel" >
                             <Property name="Text" value="Mute:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.31,0},{0.2,0},{0.37,0}}" />
                         </Window>
@@ -1298,8 +1152,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="ParalyzedLabel" >
                             <Property name="Text" value="Paralyzed:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.31,0},{0.7,0},{0.37,0}}" />
                         </Window>
@@ -1315,8 +1167,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="FrozenLabel" >
                             <Property name="Text" value="Frozen:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.38,0},{0.2,0},{0.44,0}}" />
                         </Window>
@@ -1331,8 +1181,6 @@
                         
                         <Window type="TaharezLook/StaticText" name="BurningLabel" >
                             <Property name="Text" value="Burning:" />
-                            <Property name="HorzExtent" value="36" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.52,0},{0.38,0},{0.7,0},{0.44,0}}" />
                         </Window>
@@ -1351,8 +1199,6 @@
                         <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
                         <Window type="TaharezLook/StaticText" name="EnchantLabel" >
                             <Property name="Text" value="Enchant:" />
-                            <Property name="HorzExtent" value="55" />
-                            <Property name="VertExtent" value="15.5148" />
                             <Property name="FrameEnabled" value="False" />
                             <Property name="Area" value="{{0.03,0},{0.03,0},{0.2,0},{0.1,0}}" />
                         </Window>
--- a/src/gui/contenteditor/contenteditor.cpp	Sat Mar 29 00:41:42 2014 +0200
+++ b/src/gui/contenteditor/contenteditor.cpp	Sat Mar 29 11:31:47 2014 +0200
@@ -160,7 +160,7 @@
 	// place the image in a the CEGUI label
 	CEGUI::Window* label = CEGUIUtility::getWindowForLoadedLayout(m_rootWindow, "Root/ObjectInfoTabControl/__auto_TabPane__/RenderInfoTab/meshPreview");
 
-  CEGUI::String content_editor_image_name(CEGUIUtility::getImageNameWithSkin("editor_tex", "editor_img"));
+  CEGUI::String content_editor_image_name("editor_img");
 	label->setProperty("Image", content_editor_image_name); // prev: "set:editor_imageset image:editor_img"
 	label->subscribeEvent(CEGUI::Window::EventMouseButtonDown, CEGUI::Event::Subscriber(&ContentEditor::onPreviewWindowMouseDown, this));
   label->subscribeEvent(CEGUIUtility::EventMouseLeavesWindowArea(), CEGUI::Event::Subscriber(&ContentEditor::onPreviewWindowMouseUp, this));
--- a/src/gui/contenteditor/guitabs.cpp	Sat Mar 29 00:41:42 2014 +0200
+++ b/src/gui/contenteditor/guitabs.cpp	Sat Mar 29 11:31:47 2014 +0200
@@ -13,6 +13,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+//
+// TODO(Augustin Preda, 2014.03.29): This entire file seems to be unused.
+// Verify if needed for anything and (if not used) remove it.
+//
+
 #include "guitabs.h"
 
 #include "Ogre.h"
--- a/src/gui/contenteditor/guitabs.h	Sat Mar 29 00:41:42 2014 +0200
+++ b/src/gui/contenteditor/guitabs.h	Sat Mar 29 11:31:47 2014 +0200
@@ -1,105 +1,110 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GUITABS_H
-#define GUITABS_H
-
-#include <contenttab.h>
-
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUITABS_H
+#define GUITABS_H
+
+//
+// TODO(Augustin Preda, 2014.03.29): This entire file seems to be unused.
+// Verify if needed for anything and (if not used) remove it.
+//
+
+#include <contenttab.h>
+
 #ifdef CEGUI_07
-#include <CEGUI/CEGUIWindow.h>
+#include <CEGUI/CEGUIWindow.h>
 #else
 #include "CEGUI/Window.h"
-#endif
-
-#include "OgreLog.h"
-
-namespace Ogre
-{
-	class Root;
-	class SceneManager;
-	class Camera;
-	class RenderTexture;
-}
-
-class GuiTabs : public CEGUI::Window, public ContentTab, public Ogre::LogListener
-{
-public:
-	GuiTabs(const CEGUI::String& type, const CEGUI::String& name);
-	
-	virtual void update();
-
-	virtual void messageLogged (const Ogre::String &message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName);
-
-	/**
-	 * \fn void addTabWindow(CEGUI::Window *tab);
-	 * \brief Adds a tab ContentTab window to the ContentEditor
-	 * \param tab The ContentTab to add
-	 */
-	void addTabWindow(std::string name, ContentTab *tab);
-	
-	/**
-	 * \param evt CEGUI event arguments
-	 * \brief Called upon selecting a mesh from the combobox
-	 * Updates the content of the editor scene to display the selected mesh.
-	 */
-	bool onMeshSelected(const CEGUI::EventArgs& evt);
-
-	/**
-	 * \param evt CEGUI event arguments
-	 * \brief Called upon selecting a mesh from the submesh combobox
-	 */
-	bool onSubMeshSelected(const CEGUI::EventArgs& evt);
-	
-	/**
-	 * \fn void tabExists(std::string tabName);
-	 * \brief Checks if a ContentTab exists
-	 * \param tabName Name of the ContentTab to check
-	 */
-	bool tabExists(std::string tabName);
-private:
-	CEGUI::ListboxTextItem *m_listItem;
-	CEGUI::ListboxTextItem *m_subMeshListItem;
-	CEGUI::Window *m_tabLayout;
-	CEGUI::MultiLineEditbox *m_CapsBox;
-	CEGUI::PushButton *m_startBenchmarkButton;
-	Ogre::Log *m_log;
-	Ogre::Root *m_ogreRoot;
-	Ogre::SceneManager *m_sceneManager;
-	/**
-	 * \var 	CEGUI::Window *m_rootWindow;
-	 * \brief  Pointer to the root window of this panel
-	 */
-	CEGUI::Window *m_rootWindow;
-	/**
-	 * \var 	std::map<std::string, ContentTab*>;
-	 * \brief Holds all registered ContentTabs
-	 */
-	std::map<std::string, ContentTab*> m_tabs;
-    CEGUI::TabControl* m_tabControl;
-	/**
-	 * \var 	CEGUI::WindowManager *m_winManager;
-	 * \brief  Pointer to the CEGUI::WindowManager
-	 */
-	CEGUI::WindowManager *m_winManager;
-
-	void initMeshSelector();
-	bool onCloseButton(const CEGUI::EventArgs& evt);
-	void onAddSubMesh(const CEGUI::EventArgs& evt);
-public:
-	static CEGUI::String WidgetTypeName;
-};
-
-#endif // GUITABS_H
+#endif
+
+#include "OgreLog.h"
+
+namespace Ogre
+{
+	class Root;
+	class SceneManager;
+	class Camera;
+	class RenderTexture;
+}
+
+class GuiTabs : public CEGUI::Window, public ContentTab, public Ogre::LogListener
+{
+public:
+	GuiTabs(const CEGUI::String& type, const CEGUI::String& name);
+	
+	virtual void update();
+
+	virtual void messageLogged (const Ogre::String &message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName);
+
+	/**
+	 * \fn void addTabWindow(CEGUI::Window *tab);
+	 * \brief Adds a tab ContentTab window to the ContentEditor
+	 * \param tab The ContentTab to add
+	 */
+	void addTabWindow(std::string name, ContentTab *tab);
+	
+	/**
+	 * \param evt CEGUI event arguments
+	 * \brief Called upon selecting a mesh from the combobox
+	 * Updates the content of the editor scene to display the selected mesh.
+	 */
+	bool onMeshSelected(const CEGUI::EventArgs& evt);
+
+	/**
+	 * \param evt CEGUI event arguments
+	 * \brief Called upon selecting a mesh from the submesh combobox
+	 */
+	bool onSubMeshSelected(const CEGUI::EventArgs& evt);
+	
+	/**
+	 * \fn void tabExists(std::string tabName);
+	 * \brief Checks if a ContentTab exists
+	 * \param tabName Name of the ContentTab to check
+	 */
+	bool tabExists(std::string tabName);
+private:
+	CEGUI::ListboxTextItem *m_listItem;
+	CEGUI::ListboxTextItem *m_subMeshListItem;
+	CEGUI::Window *m_tabLayout;
+	CEGUI::MultiLineEditbox *m_CapsBox;
+	CEGUI::PushButton *m_startBenchmarkButton;
+	Ogre::Log *m_log;
+	Ogre::Root *m_ogreRoot;
+	Ogre::SceneManager *m_sceneManager;
+	/**
+	 * \var 	CEGUI::Window *m_rootWindow;
+	 * \brief  Pointer to the root window of this panel
+	 */
+	CEGUI::Window *m_rootWindow;
+	/**
+	 * \var 	std::map<std::string, ContentTab*>;
+	 * \brief Holds all registered ContentTabs
+	 */
+	std::map<std::string, ContentTab*> m_tabs;
+    CEGUI::TabControl* m_tabControl;
+	/**
+	 * \var 	CEGUI::WindowManager *m_winManager;
+	 * \brief  Pointer to the CEGUI::WindowManager
+	 */
+	CEGUI::WindowManager *m_winManager;
+
+	void initMeshSelector();
+	bool onCloseButton(const CEGUI::EventArgs& evt);
+	void onAddSubMesh(const CEGUI::EventArgs& evt);
+public:
+	static CEGUI::String WidgetTypeName;
+};
+
+#endif // GUITABS_H
--- a/src/gui/contenteditor/itemeditor.cpp	Sat Mar 29 00:41:42 2014 +0200
+++ b/src/gui/contenteditor/itemeditor.cpp	Sat Mar 29 11:31:47 2014 +0200
@@ -678,13 +678,17 @@
 	// temporarily replace the image name
 	TiXmlElement * item_image = m_item_xml.RootElement()->FirstChildElement("Image");
 	if (item_image == 0)
-		return 0;
+  {
+    return 0;
+  }
+
 	std::string image = item_image->Attribute("image");
 	
-	if (image == "set:noMedia.png image:full_image")
+	if (image == "noMedia.png") // previously: "set:noMedia.png image:full_image"
 	{
 		std::stringstream itemimage;
-		itemimage <<  "set:item_imageset_" << idstream.str()<< " " << "image:item_img_" << idstream.str();
+		//itemimage <<  "set:item_imageset_" << idstream.str()<< " " << "image:item_img_" << idstream.str();
+    itemimage << "item_img_" << idstream.str();
 		label->setProperty("Image", itemimage.str().c_str());
 		
 		// itemimage.str("");
--- a/src/gui/debugpanel/debugcameratab.cpp	Sat Mar 29 00:41:42 2014 +0200
+++ b/src/gui/debugpanel/debugcameratab.cpp	Sat Mar 29 11:31:47 2014 +0200
@@ -87,7 +87,7 @@
 bool DebugCameraTab::onPlayerCameraModeChanged ( const CEGUI::EventArgs& evt )
 {
 	CEGUI::Combobox* cbo = static_cast<CEGUI::Combobox*> (
-    CEGUIUtility::getWindow("DebugCameraTab/PlayerCamOptions/ViewModes"));
+    CEGUIUtility::getWindowForLoadedLayout(this, "DebugCameraTabTabs/PlayerCamOptions/ViewModes"));
 	CEGUI::String txt =  cbo->getSelectedItem()->getText();
 	Ogre::Camera *cam = Ogre::Root::getSingleton().getSceneManager ( "DefaultSceneManager" )->getCamera ( "camera" );
 
--- a/src/gui/worldmap.cpp	Sat Mar 29 00:41:42 2014 +0200
+++ b/src/gui/worldmap.cpp	Sat Mar 29 11:31:47 2014 +0200
@@ -67,18 +67,22 @@
 	std::map<short,WaypointInfo>& winfos = World::getWorld()->getWaypointData();
 	std::map<short,WaypointInfo>::iterator it;
 	
+  // TODO(Augustin Preda, 2014.03.29): revie the way in which this stringstream is used.
+  // From the looks of it, it could be easily removed and regular strings be used instead.
 	std::ostringstream stream;
 	int cnt =0;
 	
 	CEGUI::Window* label;
 	Vector pos;
 	
-	// Schleife ueber alle Wegpunkte
+	// Run through all waypoints.
 	for (it = winfos.begin(); it != winfos.end(); ++it)
 	{
-		// nur Wegpunkte die der Spieler schon gefunden hat
+		// Skip any WayPoints that the player did not find (yet)
 		if (!player->checkWaypoint(it->first))
+    {
 			continue;
+    }
 		
 		stream.str("");
 		stream << "WaypointImage"<<cnt;
@@ -90,7 +94,6 @@
 
 			label->setProperty("FrameEnabled", "false");
 			label->setProperty("BackgroundEnabled", "false");
-			//label->setProperty("BackgroundColours", "tl:00000000 tr:00000000 bl:00000000 br:00000000"); 
 			CEGUIUtility::setWidgetSizeRel (label, 0.02f, 0.02f);
 			label->setProperty("Image", CEGUIUtility::getImageNameWithSkin ("SumWarsExtras", "WaypointMark")); 
 			label->setInheritsAlpha (false);
@@ -116,7 +119,7 @@
 	}
 	
 	
-	// restliche Label verstecken
+	// Hide the rest of the labels
 	for (; cnt <ncount; cnt++)
 	{
 		stream.str("");
@@ -186,18 +189,21 @@
 			stream << dgettext("sumwars","Town Portal") << "\n";
 			stream << dgettext("sumwars",it->second.m_name.c_str());
 			label->setTooltipText((CEGUI::utf8*) stream.str().c_str());
-			//label->setTooltip (); //XXX
 		}
 		else
 		{
 			ERRORMSG("region %s has no world position", portal.first.c_str());
 		}
 	}
-	else {
-		if(tpset == true) {
+	else 
+  {
+		if(tpset == true) 
+    {
 			stream.str ("");
 			stream << "WorldmapWindow_Holder_aux/WorldmapWindow/TownPortalImage";
-			label = CEGUIUtility::getWindowForLoadedLayoutEx (m_window, stream.str());
+			label = CEGUIUtility::getWindowForLoadedLayoutEx(
+          m_window, 
+          stream.str());
 			label->setVisible(false);
 		}