Fusion

--HG--
branch : compatibility-develop

azure-pipelines.yml

@@ -1,5 +1,6 @@
 jobs:
   - job: ubuntu16
+    timeoutInMinutes: 120
     pool:
       vmImage: 'Ubuntu-16.04'
     steps:
@@ -26,12 +27,13 @@ jobs:
         sudo apt-get install libsquish-dev -y
         sudo apt-get install liblzma-dev -y
         sudo apt-get install libgsf-1-dev -y
+        sudo apt-get install qtbase5-dev qttools5-dev qttools5-dev-tools
       displayName: 'Dependencies'
     - script: |
         mkdir build
         cmake --version
         cd build
-        cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=ON -DWITH_LIBGSF=ON ../code
+        cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON ../code
         cat CMakeCache.txt
       displayName: 'CMake'
     - script: |

code/CMakeModules/GetRevision.cmake

@@ -72,6 +72,37 @@ IF(EXISTS "${ROOT_DIR}/.hg/")
   ENDIF()
 ENDIF()
 
+IF(EXISTS "${ROOT_DIR}/.git/")
+  FIND_PACKAGE(Git)
+
+  IF(GIT_FOUND)
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE REVISION)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      message(WARNING "git rev-list failed, unable to include version.")
+    ENDIF()
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE CHANGESET)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      message(WARNING "git rev-parse failed, unable to include version.")
+    ENDIF()
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE BRANCH)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      message(WARNING "git rev-parse failed, unable to include git branch.")
+    ENDIF()
+    STRING(STRIP ${REVISION} REVISION)
+    STRING(STRIP ${CHANGESET} CHANGESET)
+    STRING(STRIP ${BRANCH} BRANCH)
+  ENDIF()
+ENDIF()
+
 # if processing exported sources, use "revision" file if exists
 IF(SOURCE_DIR AND NOT DEFINED REVISION)
   SET(REVISION_FILE ${SOURCE_DIR}/revision)

code/nel/include/nel/gui/interface_group.h

@@ -211,6 +211,11 @@ namespace NLGUI
 		int luaGetNumGroups(CLuaState &ls);
 		int luaGetGroup(CLuaState &ls);
 
+		// debug functions
+		int luaDumpSize(CLuaState &ls);
+		int luaDumpEltsOrder(CLuaState &ls);
+		int luaDumpGroups(CLuaState &ls);
+
 		void setMaxSizeRef(const std::string &maxSizeRef);
 		std::string getMaxSizeRefAsString() const;
 
@@ -223,6 +228,9 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("delGroup", luaDelGroup);
 			REFLECT_LUA_METHOD("getNumGroups", luaGetNumGroups);
 			REFLECT_LUA_METHOD("getGroup", luaGetGroup);
+			REFLECT_LUA_METHOD("dumpSize", luaDumpSize);
+			REFLECT_LUA_METHOD("dumpEltsOrder", luaDumpEltsOrder);
+			REFLECT_LUA_METHOD("dumpGroups", luaDumpGroups);
 			REFLECT_STRING ("left_click", getLeftClickHandler, setLeftClickHandler);
 			REFLECT_STRING ("right_click", getRightClickHandler, setRightClickHandler);
 			REFLECT_STRING ("left_click_params", getLeftClickHandlerParams, setLeftClickHandlerParams);
@@ -274,8 +282,8 @@ namespace NLGUI
 		sint getInsertionOrder(CViewBase *vb) const;
 
 		// for debug only
-		void dumpGroups();
+		void dumpGroups() const;
-		void dumpEltsOrder();
+		void dumpEltsOrder() const;
 
 		virtual void renderWiredQuads(CInterfaceElement::TRenderWired type, const std::string &uiFilter);
 

code/nel/src/gui/group_html.cpp

@@ -5793,7 +5793,7 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::htmlHR(const CHtmlElement &elm)
 	{
-		newParagraph(0);
+		endParagraph();
 
 		CInterfaceGroup *sep = CWidgetManager::getInstance()->getParser()->createGroupInstance("html_hr", "", NULL, 0);
 		if (sep)
@@ -5816,7 +5816,7 @@ namespace NLGUI
 			}
 
 			renderPseudoElement(":before", elm);
-			getParagraph()->addChild(sep);
+			addHtmlGroup(sep, 0);
 			renderPseudoElement(":after", elm);
 
 			endParagraph();
@@ -5828,10 +5828,9 @@ namespace NLGUI
 	{
 		if (elm.hasNonEmptyAttribute("style"))
 		{
-			_Style.Root = _Style.Current;
+			_Style.applyStyle(elm.getAttribute("style"));
-			_Style.applyRootStyle(elm.getAttribute("style"));
-			_Style.Current = _Style.Root;
 		}
+		_Style.Root = _Style.Current;
 		applyBackground(elm);
 	}
 

code/nel/src/gui/interface_group.cpp

@@ -2149,7 +2149,34 @@ namespace NLGUI
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	void CInterfaceGroup::dumpGroups()
+	int CInterfaceGroup::luaDumpSize(CLuaState &ls)
+	{
+		const char *funcName = "dumpSize";
+		CLuaIHM::checkArgCount(ls, funcName, 0);
+		dumpSize();
+		return 0;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	int CInterfaceGroup::luaDumpEltsOrder(CLuaState &ls)
+	{
+		const char *funcName = "dumpEltsOrder";
+		CLuaIHM::checkArgCount(ls, funcName, 0);
+		dumpEltsOrder();
+		return 0;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	int CInterfaceGroup::luaDumpGroups(CLuaState &ls)
+	{
+		const char *funcName = "dumpGroups";
+		CLuaIHM::checkArgCount(ls, funcName, 0);
+		dumpGroups();
+		return 0;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	void CInterfaceGroup::dumpGroups() const
 	{
 		nlinfo("Num groups = %d", (int) _ChildrenGroups.size());
 		for(uint k = 0; k < _ChildrenGroups.size(); ++k)
@@ -2166,21 +2193,18 @@ namespace NLGUI
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	void CInterfaceGroup::dumpEltsOrder()
+	void CInterfaceGroup::dumpEltsOrder() const
 	{
-		nlinfo("Num elements = %d", (int) _EltOrder.size());
+		nlinfo("Num elements = %d, num groups = %d", (int) _EltOrder.size(), _ChildrenGroups.size());
 		for(uint k = 0; k < _EltOrder.size(); ++k)
 		{
-			std::string typeName = "???";
+			CInterfaceElement *el = _EltOrder[k];
-			if (_ChildrenGroups[k])
+			if (el)
 			{
+				std::string typeName;
 				NLGUI::CViewBase *view = _EltOrder[k];
 				const type_info &ti = typeid(*view);
 				typeName = ti.name();
-			}
-			CInterfaceElement *el = _EltOrder[k];
-			if (el)
-			{
 				nlinfo("Element %d, name = %s, type=%s, x=%d, y=%d, parent_name=%s parentposname=%s xreal=%d, yreal=%d, wreal=%d, hreal=%d",
 					   k, el->getId().c_str(), typeName.c_str(), el->getX(), el->getY(), el->getParent() ? el->getParent()->getId().c_str() : "no parent",
 					   el->getParentPos() ? el->getParentPos()->getId().c_str() : "parent",

code/nel/src/misc/string_common.cpp

@@ -146,7 +146,7 @@ std::string winCpToCp(const char *str, size_t len, UINT srcCp, UINT dstCp)
 		return std::string();
 	int tmpLen = MultiByteToWideChar(srcCp, 0,
 	    str, (int)(len + 1), /* include null-termination */
-	    tmp, (int)((len + 1) * 4));
+	    tmp, (int)((len + 1) * 2));
 	if (tmpLen <= 1)
 	{
 		_freea(tmp);
@@ -172,7 +172,7 @@ std::wstring winCpToWide(const char *str, size_t len, UINT cp)
 		return std::wstring();
 	int tmpLen = MultiByteToWideChar(cp, 0,
 	    str, (int)(len + 1), /* include null-termination */
-	    tmp, (int)((len + 1) * 4));
+	    tmp, (int)((len + 1) * 2));
 	if (tmpLen <= 1)
 	{
 		_freea(tmp);

code/nel/tools/3d/anim_builder/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(anim_builder ${SRC})
 

code/nel/tools/3d/anim_builder/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/build_clod_bank/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_clod_bank ${SRC})
 

code/nel/tools/3d/build_clodtex/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_clodtex ${SRC})
 

code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
 

code/nel/tools/3d/build_far_bank/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_far_bank ${SRC})
 

code/nel/tools/3d/build_interface/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
 
 SOURCE_GROUP("" FILES ${SRC})
 

code/nel/tools/3d/build_shadow_skin/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
 

code/nel/tools/3d/build_smallbank/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_smallbank ${SRC})
 

code/nel/tools/3d/get_neighbors/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(get_neighbors ${SRC})
 

code/nel/tools/3d/get_neighbors/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/hls_bank_maker/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h)
+FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(hls_bank_maker ${SRC})
 

code/nel/tools/3d/hls_bank_maker/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/ig_add/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_add ${SRC})
 

code/nel/tools/3d/ig_add/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/ig_elevation/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_elevation ${SRC})
 

code/nel/tools/3d/ig_elevation/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/ig_lighter/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_lighter ${SRC})
 

code/nel/tools/3d/ig_lighter/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(lightmap_optimizer ${SRC})
 

code/nel/tools/3d/lightmap_optimizer/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/mesh_export/CMakeLists.txt

@@ -1,9 +1,10 @@
 FILE(GLOB SRCS *.cpp)
 FILE(GLOB HDRS *.h)
+FILE(GLOB RECS *.rc)
 
-SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
+SOURCE_GROUP("" FILES ${SRCS} ${HDRS} ${RECS})
 
-ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS})
+ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS} ${RECS})
 
 TARGET_LINK_LIBRARIES(mesh_export mesh_utils nel3d nelmisc)
 NL_DEFAULT_PROPS(mesh_export "NeL, Tools, 3D: Mesh Export")

code/nel/tools/3d/mesh_export/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/panoply_maker/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(panoply_maker ${SRC})
 

code/nel/tools/3d/panoply_maker/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/shapes_exporter/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(shapes_exporter WIN32 ${SRC})
 

code/nel/tools/3d/shapes_exporter/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "gold_pill.ico"

code/nel/tools/3d/tga_2_dds/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(tga2dds ${SRC})
 

code/nel/tools/3d/tga_2_dds/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/tga_cut/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(tga_cut ${SRC})
 

code/nel/tools/3d/tga_cut/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/unbuild_interface/CMakeLists.txt

@@ -1,11 +1,11 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
 
 SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(unbuild_interface ${SRC})
 
 TARGET_LINK_LIBRARIES(unbuild_interface nelmisc)
-NL_DEFAULT_PROPS(unbuild_interface "NeL, Tools, 3D: unbuild_interface")
+NL_DEFAULT_PROPS(unbuild_interface "NeL, Tools, 3D: Unbuild Interface")
 NL_ADD_RUNTIME_FLAGS(unbuild_interface)
 
 INSTALL(TARGETS unbuild_interface RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/3d/unbuild_interface/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "gold_pill.ico"

code/nel/tools/3d/zone_dependencies/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_dependencies ${SRC})
 

code/nel/tools/3d/zone_dependencies/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_ig_lighter ${SRC})
 

code/nel/tools/3d/zone_ig_lighter/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/zone_lighter/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_lighter ${SRC})
 

code/nel/tools/3d/zone_lighter/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/3d/zone_welder/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_welder ${SRC})
 

code/nel/tools/3d/zone_welder/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/misc/bnp_make/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(bnp_make ${SRC})
 

code/nel/tools/misc/bnp_make/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/misc/exec_timeout/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(exec_timeout ${SRC})
 

code/nel/tools/misc/exec_timeout/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "yellow_pill.ico"

code/nel/tools/misc/make_sheet_id/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(make_sheet_id ${SRC})
 

code/nel/tools/misc/make_sheet_id/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/nel/tools/misc/message_box/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(message_box WIN32 ${SRC})
 

code/nel/tools/misc/message_box/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "yellow_pill.ico"

code/nel/tools/misc/message_box_qt/CMakeLists.txt

@@ -5,7 +5,9 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-FILE(GLOB MESSAGE_BOX_SRC *.cpp)
+FILE(GLOB MESSAGE_BOX_SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${MESSAGE_BOX_SRC})
 
 SET( QT_USE_QT3SUPPORT TRUE)
 SET( QT_USE_QTXML TRUE)

code/nel/tools/misc/message_box_qt/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "yellow_pill.ico"

code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_ig_boxes ${SRC})
 

code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_indoor_rbank ${SRC})
 

code/nel/tools/pacs/build_rbank/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_rbank ${SRC})
 

code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -997,11 +997,10 @@ void CDBCtrlSheet::updateCoords ()
 {
 	if (getActive())
 	{
-		if(!_SetupInit)
-			setupInit();
-
 		if (_Type != CCtrlSheetInfo::SheetType_Macro)
 		{
+			if (!_SetupInit) setupInit();
+
 			if (_LastSheetId != _SheetId.getSInt32())
 			{
 				updateActualType();

code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(r2_islands_textures ${SRC})
 

code/ryzom/tools/client/r2_islands_textures/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(prim_export ${SRC})
 

code/ryzom/tools/leveldesign/prim_export/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(land_export ${SRC})
 

code/ryzom/tools/leveldesign/world_editor/land_export/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/ryzom/tools/patch_gen/CMakeLists.txt

@@ -1,14 +1,14 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/client/src/seven_zip)
 
-SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
+SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h patch_gen.rc)
-SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
+SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h patch_gen_service.rc)
 
-ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
+ADD_EXECUTABLE(patch_gen ${MAIN_SRC} ${RECS})
 TARGET_LINK_LIBRARIES(patch_gen ryzom_sevenzip ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator")
 NL_ADD_RUNTIME_FLAGS(patch_gen)
 
-ADD_EXECUTABLE(patch_gen_service WIN32 ${SERVICE_SRC})
+ADD_EXECUTABLE(patch_gen_service WIN32 ${SERVICE_SRC} ${RECS})
 TARGET_LINK_LIBRARIES(patch_gen_service ryzom_sevenzip ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator Service")
 NL_ADD_RUNTIME_FLAGS(patch_gen_service)

code/ryzom/tools/patch_gen/patch_gen.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"

code/ryzom/tools/patch_gen/patch_gen_service.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "red_pill.ico"

code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
+FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ai_build_wmap ${SRC})
 

code/ryzom/tools/server/ai_build_wmap/main.rc

@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"