merge from default

--HG--
branch : branch-tile-edit-ovqt-plugin

.hgignore

@@ -144,6 +144,8 @@ external
 external_stlport
 3rdParty
 .svn
+thumbs.db
+Thumbs.db
 
 # build
 code/nel/build/*

code/CMakeModules/FindDirectXSDK.cmake

@@ -14,16 +14,21 @@ FIND_PATH(DXSDK_DIR
   "Include/dxsdkver.h"
   PATHS
   "$ENV{DXSDK_DIR}"
+  "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)"
+  "C:/Program Files/Microsoft DirectX SDK (June 2010)"
+  "C:/Program Files (x86)/Microsoft DirectX SDK (February 2010)"
+  "C:/Program Files/Microsoft DirectX SDK (February 2010)"
+  "C:/Program Files (x86)/Microsoft DirectX SDK (November 2007)"
+  "C:/Program Files/Microsoft DirectX SDK (November 2007)"
+  "C:/Program Files (x86)/Microsoft DirectX SDK"
+  "C:/Program Files/Microsoft DirectX SDK"
 )
 
 MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)        
   FIND_LIBRARY(${MYLIBRARY}
                NAMES ${MYLIBRARYNAME}
                PATHS
-			   "${DXSDK_LIBRARY_DIR}"
+               "${DXSDK_LIBRARY_DIR}"
-               "$ENV{DXSDK_DIR}"
-               "$ENV{DXSDK_DIR}/Lib"
-               "$ENV{DXSDK_DIR}/Lib/x86"
                )
 ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
 

code/CMakeModules/nel.cmake

@@ -37,7 +37,9 @@ ENDMACRO(NL_TARGET_DRIVER)
 # Argument:
 ###
 MACRO(NL_DEFAULT_PROPS name label)
-  SET_TARGET_PROPERTIES(${name} PROPERTIES PROJECT_LABEL ${label})
+  IF(NOT MSVC10)
+    SET_TARGET_PROPERTIES(${name} PROPERTIES PROJECT_LABEL ${label})
+  ENDIF(NOT MSVC10)
   GET_TARGET_PROPERTY(type ${name} TYPE)
   IF(${type} STREQUAL SHARED_LIBRARY)
     # Set versions only if target is a shared library
@@ -302,27 +304,66 @@ MACRO(NL_SETUP_BUILD)
     ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
   ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
 
+  SET(HOST_CPU ${CMAKE_SYSTEM_PROCESSOR})
+
   # Determine target CPU
-#  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+  IF(NOT TARGET_CPU)
-    IF(NOT CMAKE_SIZEOF_VOID_P)
+    SET(TARGET_CPU $ENV{DEB_HOST_GNU_CPU})
-      INCLUDE (CheckTypeSize)
+  ENDIF(NOT TARGET_CPU)
-      CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
-    ENDIF(NOT CMAKE_SIZEOF_VOID_P)
 
-    # Using 32 or 64 bits libraries
+  # If not specified, use the same CPU as host
+  IF(NOT TARGET_CPU)
+    SET(TARGET_CPU ${CMAKE_SYSTEM_PROCESSOR})
+  ENDIF(NOT TARGET_CPU)
+
+  IF(TARGET_CPU MATCHES "amd64")
+    SET(TARGET_CPU "x86_64")
+  ELSEIF(TARGET_CPU MATCHES "i.86")
+    SET(TARGET_CPU "x86")
+  ENDIF(TARGET_CPU MATCHES "amd64")
+
+  # DEB_HOST_ARCH_ENDIAN is 'little' or 'big'
+  # DEB_HOST_ARCH_BITS is '32' or '64'
+
+  # If target and host CPU are the same
+  IF("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+    # x86-compatible CPU
+    IF(HOST_CPU MATCHES "x86")
+      IF(NOT CMAKE_SIZEOF_VOID_P)
+        INCLUDE (CheckTypeSize)
+        CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
+      ENDIF(NOT CMAKE_SIZEOF_VOID_P)
+
+      # Using 32 or 64 bits libraries
+      IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(TARGET_CPU "x86_64")
+      ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(TARGET_CPU "x86")
+      ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    ENDIF(HOST_CPU MATCHES "x86")
+    # TODO: add checks for ARM and PPC
+  ELSE("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+    MESSAGE(STATUS "Compiling on ${HOST_CPU} for ${TARGET_CPU}")
+  ENDIF("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+
+  IF(TARGET_CPU STREQUAL "x86_64")
+    SET(TARGET_X64 1)
+    SET(PLATFORM_CFLAGS "-DHAVE_X86_64")
+  ELSEIF(TARGET_CPU STREQUAL "x86")
     SET(TARGET_X86 1)
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET(PLATFORM_CFLAGS "-DHAVE_X86")
-      SET(ARCH "x86_64")
+  ENDIF(TARGET_CPU STREQUAL "x86_64")
-      SET(TARGET_X64 1)
-      ADD_DEFINITIONS(-DHAVE_X86_64)
-    ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      SET(ARCH "x86")
-      ADD_DEFINITIONS(-DHAVE_X86)
-    ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-#     ADD_DEFINITIONS(-DHAVE_IA64)
-#  ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
 
-  IF(WIN32)
+  # Fix library paths suffixes for Debian MultiArch
+  IF(NOT CMAKE_LIBRARY_ARCHITECTURE)
+    SET(CMAKE_LIBRARY_ARCHITECTURE $ENV{DEB_HOST_MULTIARCH})
+  ENDIF(NOT CMAKE_LIBRARY_ARCHITECTURE)
+
+  IF(CMAKE_LIBRARY_ARCHITECTURE)
+    SET(CMAKE_LIBRARY_PATH "/lib/${CMAKE_LIBRARY_ARCHITECTURE};/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE};${CMAKE_LIBRARY_PATH}")
+  ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
+
+  IF(MSVC)
     IF(MSVC10)
       # /Ox is working with VC++ 2010, but custom optimizations don't exist
       SET(SPEED_OPTIMIZATIONS "/Ox /GF /GS-")
@@ -364,8 +405,17 @@ MACRO(NL_SETUP_BUILD)
     SET(NL_RELEASE_CFLAGS "/MD /D NDEBUG ${SPEED_OPTIMIZATIONS}")
     SET(NL_DEBUG_LINKFLAGS "/NODEFAULTLIB:msvcrt /INCREMENTAL:YES")
     SET(NL_RELEASE_LINKFLAGS "/OPT:REF /OPT:ICF /INCREMENTAL:NO")
-  ELSE(WIN32)
+  ELSE(MSVC)
-    SET(PLATFORM_CFLAGS "-g -pipe -ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
+    IF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m32 -march=i686")
+    ENDIF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+
+    IF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m64")
+    ENDIF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+
+    SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -g -D_REENTRANT -pipe -ftemplate-depth-48 -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
+
     IF(WITH_COVERAGE)
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
     ENDIF(WITH_COVERAGE)
@@ -382,12 +432,12 @@ MACRO(NL_SETUP_BUILD)
     SET(PLATFORM_CXXFLAGS ${PLATFORM_CFLAGS})
 
     IF(NOT APPLE)
-      SET(PLATFORM_LINKFLAGS "-Wl,--no-undefined -Wl,--as-needed")
+      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--no-undefined -Wl,--as-needed")
     ENDIF(NOT APPLE)
 
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -D_DEBUG")
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -DNDEBUG -O6")
-  ENDIF(WIN32)
+  ENDIF(MSVC)
 ENDMACRO(NL_SETUP_BUILD)
 
 MACRO(NL_SETUP_BUILD_FLAGS)
@@ -451,7 +501,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(WIN32)
       SET(NL_LIB_PREFIX "../lib" CACHE PATH "Installation path for libraries.")
     ELSE(WIN32)
-      SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation path for libraries.")
+      IF(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
+      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation path for libraries.")
+      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
     ENDIF(WIN32)
   ENDIF(NOT NL_LIB_PREFIX)
 
@@ -460,7 +514,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(WIN32)
       SET(NL_DRIVER_PREFIX "../lib" CACHE PATH "Installation path for drivers.")
     ELSE(WIN32)
-      SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
+      IF(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/nel" CACHE PATH "Installation path for drivers.")
+      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
+      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
     ENDIF(WIN32)
   ENDIF(NOT NL_DRIVER_PREFIX)
 

code/nel/include/nel/misc/common.h

@@ -342,6 +342,8 @@ std::string secondsToHumanReadable (uint32 time);
 /// Get a bytes or time in string format and convert it in seconds or bytes
 uint32 fromHumanReadable (const std::string &str);
 
+/// Add digit grouping seperator to if value >= 10 000. Assumes input is numerical string.
+std::string formatThousands(const std::string& s);
 
 /// This function executes a program in the background and returns instantly (used for example to launch services in AES).
 /// The program will be launched in the current directory

code/nel/include/nel/misc/eid_translator.h

@@ -146,6 +146,8 @@ public:
 
 	TAdditionalInfoCb	EntityInfoCallback;
 
+	static void removeShardFromName(ucstring& name);
+
 private:
 	// get all eid for a user using the user name or the user id
 	void				getByUser (uint32 uid, std::vector<NLMISC::CEntityId> &res);

code/nel/include/nel/net/transport_class.h

@@ -75,7 +75,7 @@ public:
 	enum TProp {
 		PropUInt8, PropUInt16, PropUInt32, PropUInt64,
 		PropSInt8, PropSInt16, PropSInt32, PropSInt64,
-		PropBool, PropFloat, PropDouble, PropString, PropDataSetRow, PropSheetId, PropUKN };
+		PropBool, PropFloat, PropDouble, PropString, PropDataSetRow, PropSheetId, PropUCString, PropUKN };
 //		PropBool, PropFloat, PropDouble, PropString, PropDataSetRow, PropEntityId, PropSheetId, PropUKN };
 
 
@@ -160,6 +160,7 @@ public:
 		case PropString: nlassert(sizeof(T) == sizeof (std::string)); break;
 //		case PropEntityId: nlassert(sizeof(T) == sizeof (NLMISC::CEntityId)); break;
 		case PropSheetId: nlassert(sizeof(T) == sizeof (NLMISC::CSheetId)); break;
+		case PropUCString: nlassert(sizeof(T) == sizeof (ucstring)); break;
 		default: nlerror ("property %s have unknown type %d", name.c_str(), type);
 		}
 

code/nel/src/3d/driver/opengl/driver_opengl_light.cpp

@@ -138,7 +138,7 @@ void	CDriverGL::setLightInternal(uint8 num, const CLight& light)
 		}
 		else
 		{
-			// Deactivate spot properties
+			// Disable spot properties
 #ifdef USE_OPENGLES
 			glLightf (lightNum, GL_SPOT_CUTOFF, 180.f);
 			glLightf (lightNum, GL_SPOT_EXPONENT, 0.f);

code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp

@@ -978,7 +978,7 @@ void		CDriverGL::setupGlArraysStd(CVertexBufferInfo &vb)
 				// Check type
 				nlassert (vb.Type[CVertexBuffer::Normal]==CVertexBuffer::Float3);
 				_DriverGLStates.enableNormalArray(true);
-					nglArrayObjectATI(GL_NORMAL_ARRAY, 3, GL_FLOAT, vb.VertexSize, vb.VertexObjectId, (ptrdiff_t) vb.ValuePtr[CVertexBuffer::Normal]);
+				nglArrayObjectATI(GL_NORMAL_ARRAY, 3, GL_FLOAT, vb.VertexSize, vb.VertexObjectId, (ptrdiff_t) vb.ValuePtr[CVertexBuffer::Normal]);
 			}
 			else
 			{

code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp

@@ -149,14 +149,28 @@ static NLMISC::TKey virtualKeycodeToNelKey(unsigned short keycode)
 
 bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text)
 {
-#warning "OpenGL Driver: Missing Mac Implementation for pasteTextFromClipboard"
+	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
+	NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
+	NSDictionary *options = [NSDictionary dictionary];
+	
+	BOOL ok = [pasteboard canReadObjectForClasses:classArray options:options];
+	if (ok) 
+	{
+		NSArray *objectsToPaste = [pasteboard readObjectsForClasses:classArray options:options];
+		NSString *nstext = [objectsToPaste objectAtIndex:0];
+		text.fromUtf8([nstext UTF8String]);
+		return true;
+	}
 	return false;
 }
 
 bool CCocoaEventEmitter::copyTextToClipboard(const ucstring &text)
 {
-#warning "OpenGL Driver: Missing Mac Implementation for copyTextToClipboard"
+	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-	return false;
+	[pasteboard clearContents];
+	NSArray *copiedObjects = [NSArray arrayWithObject:[NSString stringWithUTF8String:text.toUtf8().c_str()]];
+	[pasteboard writeObjects:copiedObjects];
+	return true;
 }
 
 /// convert modifier key state to nel internal modifier key state

code/nel/src/3d/driver/opengl/mac/glext.h

@@ -4851,8 +4851,10 @@ typedef ptrdiff_t GLsizeiptrARB;
 #ifndef GL_ARB_shader_objects
 /* GL types for program/shader text and shader object handles */
 typedef char GLcharARB;
+#if !defined(MAC_OS_X_VERSION_10_7)
 typedef unsigned int GLhandleARB;
 #endif
+#endif
 
 /* GL type for "half" precision (s10e5) float data in host memory */
 #ifndef GL_ARB_half_float_pixel

code/nel/src/3d/nelu.cpp

@@ -58,7 +58,7 @@ bool			CNELU::initDriver (uint w, uint h, uint bpp, bool windowed, nlWindow syst
 	CNELU::Driver = NULL;
 
 	// Init driver.
-#if defined(NL_OS_WINDOWS)
+#ifdef NL_OS_WINDOWS
 	if (direct3d)
 	{
 		CNELU::Driver= CDRU::createD3DDriver();
@@ -75,6 +75,7 @@ bool			CNELU::initDriver (uint w, uint h, uint bpp, bool windowed, nlWindow syst
 		nlwarning ("CNELU::initDriver: no driver found");
 		return false;
 	}
+
 	if (!CNELU::Driver->init())
 	{
 		nlwarning ("CNELU::initDriver: init() failed");

code/nel/src/3d/patchdlm_context.cpp

@@ -1018,8 +1018,8 @@ void			CPatchDLMContext::computeTextureFar()
 						// compute src pixel
 						const CRGBA	*srcPixel= pTile->getPixels(CTileFarBank::diffuse, CTileFarBank::order1);
 						// compute src info, for this tile rot and 256x256 context.
-						sint srcDeltaX;
+						sint srcDeltaX = 0;
-						sint srcDeltaY;
+						sint srcDeltaY = 0;
 						srcPixel= computeTileFarSrcDeltas(nRot, is256x256, uvOff, srcPixel, srcDeltaX, srcDeltaY);
 
 						// compute dst coordinate. start writing at pixel (1,1)

code/nel/src/ligo/primitive.cpp

@@ -2118,7 +2118,7 @@ bool CPrimAlias::read (xmlNodePtr xmlNode, const char *filename, uint version, C
 	xmlNodePtr ptNode = CIXml::getFirstChildNode (xmlNode, "ALIAS");
 	if (ptNode)
 	{
-		int val;
+		sint val = 0;
 		if (ReadInt ("VALUE", val, filename, ptNode))
 		{
 			_Alias = uint32(val);

code/nel/src/misc/common.cpp

@@ -30,6 +30,7 @@
 
 #include "nel/misc/command.h"
 #include "nel/misc/path.h"
+#include "nel/misc/i18n.h"
 
 using namespace std;
 
@@ -526,6 +527,31 @@ void		toUpper(char *str)
 	}
 }
 
+std::string formatThousands(const std::string& s)
+{
+	int i, k;
+	int remaining = s.length() - 1;
+	static std::string separator = NLMISC::CI18N::get("uiThousandsSeparator").toUtf8();
+
+	// Don't add separator if the number is < 10k
+	if (remaining < 4) return s;
+
+	std::string ns;
+
+	do
+	{
+	for (i = remaining, k = 0; i >= 0 && k < 3; --i, ++k )
+		{
+			ns = s[i] + ns; // New char is added to front of ns
+			if ( i > 0 && k == 2) ns = separator + ns; // j > 0 means still more digits
+		}
+
+		remaining -= 3;
+	}
+	while (remaining >= 0);
+
+	return ns;
+}
 
 //
 // Exceptions

code/nel/src/misc/eid_translator.cpp

@@ -417,6 +417,17 @@ void CEntityIdTranslator::checkEntity (const CEntityId &eid, const ucstring &ent
 	}
 }
 
+void CEntityIdTranslator::removeShardFromName(ucstring& name)
+{
+	// The string must contain a '(' and a ')'
+	ucstring::size_type	p0= name.find('(');
+	ucstring::size_type	p1= name.find(')');
+	if (p0 == ucstring::npos || p1 == ucstring::npos || p1 <= p0)
+		return;
+
+	name = name.substr(0, p0) + name.substr(p1 + 1);
+}
+
 // this callback is call when the file is changed
 void cbInvalidEntityNamesFilename(const std::string &invalidEntityNamesFilename)
 {

code/nel/src/misc/events.cpp

@@ -178,7 +178,7 @@ static const CStringConversion<TKey>::CPair stringTable [] =
 	{ "KeyZOOM", KeyZOOM },
 	{ "KeyNONAME", KeyNONAME },
 	{ "KeyPA1", KeyPA1 },
-	{ "KeyOEM_CLEAR", KeyOEM_CLEAR },
+	{ "KeyOEM_CLEAR", KeyOEM_CLEAR }
 };
 
 

code/nel/src/misc/noise_value.cpp

@@ -18,7 +18,7 @@
 
 #include "nel/misc/noise_value.h"
 #include "nel/misc/fast_floor.h"
-
+#include "nel/misc/random.h"
 
 
 namespace NLMISC
@@ -45,7 +45,8 @@ public:
 	CRandomGrid3D()
 	{
 		//seed
-		srand(0);
+		CRandom Random;
+		Random.srand(0);
 
 		// init the grid
 		for(uint z=0; z<NL3D_NOISE_GRID_SIZE; z++)
@@ -56,7 +57,7 @@ public:
 				{
 					uint	id= x + (y<<NL3D_NOISE_GRID_SIZE_SHIFT) + (z<<(NL3D_NOISE_GRID_SIZE_SHIFT*2));
 					// take higher bits of rand gives better result.
-					uint	v= rand() >> 5;
+					uint	v= Random.rand() >> 5;
 					_Texture3d[id]= v&255;
 				}
 			}
@@ -80,9 +81,9 @@ public:
 		// init LevelPhases.
 		for(i=0; i<NL3D_NOISE_LEVEL; i++)
 		{
-			_LevelPhase[i].x= frand(NL3D_NOISE_GRID_SIZE);
+			_LevelPhase[i].x= Random.frand(NL3D_NOISE_GRID_SIZE);
-			_LevelPhase[i].y= frand(NL3D_NOISE_GRID_SIZE);
+			_LevelPhase[i].y= Random.frand(NL3D_NOISE_GRID_SIZE);
-			_LevelPhase[i].z= frand(NL3D_NOISE_GRID_SIZE);
+			_LevelPhase[i].z= Random.frand(NL3D_NOISE_GRID_SIZE);
 		}
 		// not for level 0.
 		_LevelPhase[0]= CVector::Null;

code/nel/src/misc/rgba.cpp

@@ -643,6 +643,8 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const
 	{
 		h = 2.f + (b - r) / diff;
 	}
+#if defined(GCC_VERSION) && (GCC_VERSION == 40204)
+	// use the fix only if using the specific GCC version
 	else if (maxV == b)
 	{
 		h = 4.f + (r - g) / diff;
@@ -652,6 +654,12 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const
 		// this case is to fix a compiler bug
 		h = (g - b) / diff;
 	}
+#else
+	else
+	{
+		h = 4.f + (r - g) / diff;
+	}
+#endif
 
 	h *= 60.f; // scale to [0..360]
 

code/nel/src/misc/win_event_emitter.cpp

@@ -153,6 +153,13 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 			if ((int)wParam==VK_SHIFT)
 				_ShiftButton=false;
 
+			// As Print Screen button does not trigger a WM_KEYDOWN msg, simulate it here
+			if ((int)wParam==VK_SNAPSHOT)
+			{
+				if (wParam < KeyCount)
+					server->postEvent (new CEventKeyDown ((NLMISC::TKey)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), true, this));
+			}
+
 			// Post the message
 			if (wParam < KeyCount)
 				server->postEvent (new CEventKeyUp ((NLMISC::TKey)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));

code/nel/src/net/transport_class.cpp

@@ -77,7 +77,7 @@ string typeToString (CTransportClass::TProp type)
 	string conv[] = {
 		"PropUInt8", "PropUInt16", "PropUInt32", "PropUInt64",
 		"PropSInt8", "PropSInt16", "PropSInt32", "PropSInt64",
-		"PropBool", "PropFloat", "PropDouble", "PropString", "PropDataSetRow", "PropSheetId", "PropUKN" };
+		"PropBool", "PropFloat", "PropDouble", "PropString", "PropDataSetRow", "PropSheetId", "PropUCString", "PropUKN" };
 //		"PropBool", "PropFloat", "PropDouble", "PropString", "PropDataSetRow", "PropEntityId", "PropSheetId", "PropUKN" };
 
 	if (type > CTransportClass::PropUKN)
@@ -352,6 +352,7 @@ void CTransportClass::init ()
 //	nlassert (PropDataSetRow < PropUKN); DummyProp[PropDataSetRow] = new CTransportClass::CRegisteredProp<TDataSetRow>;
 //	nlassert (PropEntityId < PropUKN); DummyProp[PropEntityId] = new CTransportClass::CRegisteredProp<CEntityId>;
 	nlassert (PropSheetId < PropUKN); DummyProp[PropSheetId] = new CTransportClass::CRegisteredProp<CSheetId>;
+	nlassert (PropUCString < PropUKN); DummyProp[PropUCString] = new CTransportClass::CRegisteredProp<ucstring>;
 
 	// we have to know when a service comes, so add callback (put the callback before all other one because we have to send this message first)
 	CUnifiedNetwork::getInstance()->setServiceUpCallback("*", cbTCUpService, NULL, false);

code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt

@@ -8,6 +8,7 @@ ADD_SUBDIRECTORY(object_viewer)
 ADD_SUBDIRECTORY(georges_editor)
 ADD_SUBDIRECTORY(translation_manager)
 ADD_SUBDIRECTORY(tile_editor)
+ADD_SUBDIRECTORY(bnp_manager)
 # Note: Temporarily disabled until development continues.
 #ADD_SUBDIRECTORY(zone_painter)
 # Ryzom Specific Plugins

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/CMakeLists.txt

@@ -0,0 +1,47 @@
+INCLUDE_DIRECTORIES(  ${CMAKE_CURRENT_BINARY_DIR}
+                      ${CMAKE_CURRENT_SOURCE_DIR}
+                      ${LIBXML2_INCLUDE_DIR}
+                      ${QT_INCLUDES})
+
+FILE(GLOB SRC *.cpp *.h)
+SET(OVQT_EXT_SYS_SRC  ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
+
+SET(OVQT_PLUG_BNP_MANAGER_HDR  bnp_manager_plugin.h 
+                                  bnp_manager_window.h
+								  bnp_dirtree_dialog.h
+								  bnp_filesystem_model.h
+								  bnp_file.h
+								  bnp_filelist_dialog.h
+								  bnp_proxy_model.h
+                                  )
+SET(OVQT_PLUG_BNP_MANAGER_UIS	bnp_dirtree_form.ui
+								bnp_filelist_dialog.ui
+								)
+
+SET(OVQT_PLUGIN_BNP_MANAGER_RCS bnp_manager.qrc)
+
+SET(QT_USE_QTGUI TRUE)
+
+QT4_ADD_RESOURCES(OVQT_PLUGIN_BNP_MANAGER_RC_SRCS ${OVQT_PLUGIN_BNP_MANAGER_RCS})
+QT4_WRAP_CPP(OVQT_PLUG_BNP_MANAGER_MOC_SRC ${OVQT_PLUG_BNP_MANAGER_HDR})
+QT4_WRAP_UI(OVQT_PLUG_BNP_MANAGER_UI_HDRS ${OVQT_PLUG_BNP_MANAGER_UIS})
+
+SOURCE_GROUP(QtResources FILES ${OVQT_PLUG_BNP_MANAGER_UIS} ${OVQT_PLUGIN_BNP_MANAGER_RCS})
+SOURCE_GROUP(QtGeneratedUiHdr FILES ${OVQT_PLUG_BNP_MANAGER_UI_HDRS})
+SOURCE_GROUP(QtGeneratedMocSrc FILES ${OVQT_PLUG_BNP_MANAGER_MOC_SRC})
+SOURCE_GROUP("BNP Manager Plugin" FILES ${SRC})
+SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
+
+ADD_LIBRARY(ovqt_plugin_bnp_manager MODULE ${SRC} ${OVQT_PLUG_BNP_MANAGER_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUGIN_BNP_MANAGER_RC_SRCS} ${OVQT_PLUG_BNP_MANAGER_UI_HDRS})
+
+TARGET_LINK_LIBRARIES(ovqt_plugin_bnp_manager ovqt_plugin_core nelmisc nelgeorges ${QT_LIBRARIES})
+
+NL_DEFAULT_PROPS(ovqt_plugin_bnp_manager "NeL, Tools, 3D: Object Viewer Qt Plugin: BNP Manager")
+NL_ADD_RUNTIME_FLAGS(ovqt_plugin_bnp_manager)
+NL_ADD_LIB_SUFFIX(ovqt_plugin_bnp_manager)
+
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+
+INSTALL(TARGETS ovqt_plugin_bnp_manager LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp

@@ -0,0 +1,93 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_dirtree_dialog.h"
+#include "bnp_filesystem_model.h"
+#include "bnp_proxy_model.h"
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+namespace BNPManager
+{
+
+CBnpDirTreeDialog::CBnpDirTreeDialog(QString bnpPath, QWidget *parent)
+	:	QDockWidget(parent),
+		m_DataPath(bnpPath)
+{
+	// Setup the dialog
+	m_ui.setupUi(this);
+
+	// Filter settings to only display files with bnp extension.
+	// Could be changed to display all files and react according to the extension:
+	// Bnp file: opened and displayed
+	// all other files: added to the currently opened bnp file
+	QStringList filter;
+    //filter << tr("*.bnp");
+
+	// Setup the directory tree model
+	m_dirModel= new BNPFileSystemModel();
+	m_proxyModel = new BNPSortProxyModel();
+	m_dirModel->setRootPath(m_DataPath);
+	m_dirModel->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::AllEntries);
+	m_dirModel->setNameFilters(filter);
+    m_dirModel->setNameFilterDisables(0);
+
+	m_proxyModel->setSourceModel(m_dirModel);
+
+	m_ui.dirTree->setModel(m_proxyModel);
+
+	m_ui.dirTree->setRootIndex( m_proxyModel->mapFromSource (m_dirModel->index(m_DataPath) ) );
+	m_ui.dirTree->setSortingEnabled(true);
+
+	// Trigger if one filename is activated
+	// In future drag&drop should be also possible
+	connect(m_ui.dirTree, SIGNAL(activated(QModelIndex)),
+			this, SLOT(fileSelected(QModelIndex)));
+}
+// ***************************************************************************
+CBnpDirTreeDialog::~CBnpDirTreeDialog()
+{
+
+}
+// ***************************************************************************
+void CBnpDirTreeDialog::fileSelected(QModelIndex index)
+{
+	QModelIndex source = m_proxyModel->mapToSource(index);
+	if (source.isValid() && !m_dirModel->isDir(source))
+	{
+		// emit the according signal to BNPManagerWindow class
+		Q_EMIT selectedFile(m_dirModel->fileInfo(source).filePath());
+	}
+}
+// ***************************************************************************
+void CBnpDirTreeDialog::changeFile(QString file)
+{
+
+}
+// ***************************************************************************
+void CBnpDirTreeDialog::BnpPathChanged(QString path)
+{
+
+}
+// ***************************************************************************
+}
+
+

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.h

@@ -0,0 +1,83 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_DIRTREE_DIALOG_H
+#define BNP_DIRTREE_DIALOG_H
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// STL includes
+
+// NeL includes
+
+// Project includes
+#include "ui_bnp_dirtree_form.h"
+
+namespace BNPManager
+{
+
+class BNPFileSystemModel;
+class BNPSortProxyModel;
+
+class CBnpDirTreeDialog : public QDockWidget
+{
+	Q_OBJECT
+public:
+
+	/**
+	 * Constructor
+	 * \param path to root directory, which should be displayed
+	 */
+	CBnpDirTreeDialog(QString bnpPath, QWidget *parent = 0);
+
+	/**
+	 * Destructor
+	 */
+	~CBnpDirTreeDialog();
+
+	/**
+	 * Change the root path for the dir tree view
+	 * \param data path to the new directory
+	 */
+	void BnpPathChanged(QString);
+
+private:
+
+	Ui::CBnpDirTreeDialog	m_ui;
+
+	// path ro data root directory
+	QString					m_DataPath;
+
+	BNPFileSystemModel		*m_dirModel;
+
+	BNPSortProxyModel		*m_proxyModel;
+
+Q_SIGNALS:
+	void selectedFile(const QString);
+
+private Q_SLOTS:
+	/**
+	 * Triggered if the user activates (double klick on windows)
+	 * a file name in the dir tree view
+	 * \param selected ModelIndex (filename)
+	 */
+	void fileSelected(QModelIndex index);
+
+	void changeFile(QString file);
+};
+}
+#endif

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_form.ui

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CBnpDirTreeDialog</class>
+ <widget class="QDockWidget" name="CBnpDirTreeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>141</height>
+   </size>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+  </property>
+  <property name="windowTitle">
+   <string>BNP Datapath</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="minimumSize">
+    <size>
+     <width>50</width>
+     <height>0</height>
+    </size>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0" colspan="2">
+     <widget class="QTreeView" name="dirTree">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../../object_viewer_qt.qrc"/>
+  <include location="../core/core.qrc"/>
+  <include location="bnp_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp

@@ -0,0 +1,313 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_file.h"
+
+// Nel includes
+#include <nel/misc/debug.h>
+#include <nel/misc/file.h>
+#include <nel/misc/path.h>
+#include <nel/misc/algo.h>
+#include <nel/misc/common.h>
+
+// Qt includes
+
+using namespace NLMISC;
+using namespace std;
+
+
+namespace BNPManager
+{
+
+PackedFile::PackedFile()
+{
+	m_size = 0;
+	m_pos = 0;
+}
+
+NLMISC_SAFE_SINGLETON_IMPL(BNPFileHandle);
+
+BNPFileHandle::BNPFileHandle()
+{
+	m_offsetFromBeginning = 0;
+}
+// ***************************************************************************
+BNPFileHandle::~BNPFileHandle()
+{
+	// Erase the list
+	m_packedFiles.clear();
+}
+// ***************************************************************************
+void BNPFileHandle::releaseInstance()
+{
+	if (_Instance)
+	{
+		NLMISC::INelContext::getInstance().releaseSingletonPointer("BNPFileHandle", _Instance);
+		delete _Instance;
+		_Instance = NULL;
+	}
+}
+// ***************************************************************************
+bool BNPFileHandle::unpack(const string &dirName, const vector<string>& fileList)
+{
+	CIFile bnp;
+	bnp.open(m_openedBNPFile);
+
+	TPackedFilesList::iterator it_files = m_packedFiles.begin();
+
+	for (it_files; it_files != m_packedFiles.end(); it_files++)
+	{
+		// Check if the file should be unpacked or not
+		if (find(fileList.begin(), fileList.end(), it_files->m_name) != fileList.end())
+		{
+			string filename = dirName + "/" + it_files->m_name;
+
+			COFile out;
+			if ( out.open(filename) )
+			{
+				bnp.seek(it_files->m_pos, IStream::begin);
+				uint8 *ptr = new uint8[it_files->m_size];
+				bnp.serialBuffer(ptr,it_files->m_size);
+				out.serialBuffer(ptr,it_files->m_size);
+				delete [] ptr;
+			}
+			out.close();
+		}
+	}
+
+	bnp.close();
+	return true;
+}
+// ***************************************************************************
+// Read the header from a big file
+bool BNPFileHandle::readHeader(const std::string &filePath)
+{
+	m_packedFiles.clear();
+
+	m_openedBNPFile = filePath;
+
+	CIFile bnp;
+	bnp.open (filePath);
+
+	bnp.seek(0, IStream::end);
+	uint32 nFileSize = bnp.getFileSize();
+	bnp.seek(nFileSize-sizeof(uint32), IStream::begin);
+
+	uint32 nOffsetFromBegining;
+
+	bnp.serial(nOffsetFromBegining);
+	
+	if ( !bnp.seek (nOffsetFromBegining, IStream::begin) )
+	{
+		nlwarning("Could not read offset from begining");
+		bnp.close();
+		return false;
+	}
+
+	uint32 nNbFile;
+	bnp.serial(nNbFile);
+
+	for (uint32 i = 0; i < nNbFile; ++i)
+	{
+		uint8 nStringSize;
+		char sName[256];
+
+		bnp.serial(nStringSize);
+		bnp.serialBuffer( (uint8*)sName, nStringSize);
+		sName[nStringSize] = 0;
+
+		PackedFile tmpPackedFile;
+		tmpPackedFile.m_name = sName;
+		tmpPackedFile.m_path = m_openedBNPFile;
+		
+		bnp.serial(tmpPackedFile.m_size);
+		bnp.serial(tmpPackedFile.m_pos);
+
+		m_packedFiles.push_back (tmpPackedFile);
+	}
+
+	bnp.close();
+	return true;
+}
+// ***************************************************************************
+void BNPFileHandle::list(TPackedFilesList& FileList)
+{
+	PackedFile tmpFile;
+	TPackedFilesList::iterator it = m_packedFiles.begin();
+	while (it != m_packedFiles.end() )
+	{
+		tmpFile.m_name = it->m_name;
+		tmpFile.m_pos = it->m_pos;
+		tmpFile.m_size = it->m_size;
+		tmpFile.m_path = it->m_path;
+		FileList.push_back(tmpFile);
+		it++;
+	}
+}
+// ***************************************************************************
+bool BNPFileHandle::writeHeader( const std::string &filePath, uint32 offset )
+{
+	COFile bnp;
+	bnp.open(filePath, true);
+	if ( !bnp.isOpen() )
+		return false;
+
+	uint32 nNbFile = (uint32)m_packedFiles.size();
+	bnp.serial(nNbFile);
+
+	for (uint32 i = 0; i < nNbFile; ++i)
+	{
+		uint8 nStringSize = (uint8)m_packedFiles[i].m_name.size();
+		bnp.serial( nStringSize );
+		bnp.serialBuffer( (uint8*)m_packedFiles[i].m_name.c_str(), nStringSize	 );
+		bnp.serial(m_packedFiles[i].m_size);
+		bnp.serial(m_packedFiles[i].m_pos);
+	}
+
+	bnp.serial(offset);
+
+	bnp.close();
+
+	return true;
+}
+// ***************************************************************************
+void BNPFileHandle::fileNames(std::vector<std::string> &fileNames)
+{
+	TPackedFilesList::iterator it = m_packedFiles.begin();
+	while (it != m_packedFiles.end() )
+	{
+		fileNames.push_back(it->m_name);
+		it++;
+	}
+}
+// ***************************************************************************
+void BNPFileHandle::addFiles( const vector<string> &filePathes)
+{
+	uint32 OffsetFromBegining = 0;
+
+	// create packed files and add them to the private vector
+	vector<string>::const_iterator it_vec = filePathes.begin();
+	while (it_vec != filePathes.end() )
+	{
+		PackedFile tmpFile;
+		tmpFile.m_name = CFile::getFilename (*it_vec);
+		// Leave position to 0 and set the value during the new bnp file is creating
+		// We need the position only for the header at the end
+		tmpFile.m_pos = 0;
+		tmpFile.m_size = CFile::getFileSize(*it_vec);
+		tmpFile.m_path = *it_vec;
+		m_packedFiles.push_back( tmpFile );
+
+		it_vec++;
+	}
+
+	// sort packed files alphabetic
+	std::sort ( m_packedFiles.begin(), m_packedFiles.end(), compare );
+
+	// create a new temporary bnp file with extension *.tmp
+	TPackedFilesList::iterator it_packed = m_packedFiles.begin();
+	while (it_packed != m_packedFiles.end() )
+	{
+		append(m_openedBNPFile + ".tmp", *it_packed);
+		// Set now the new offset for the new header
+		it_packed->m_pos = OffsetFromBegining;
+		OffsetFromBegining += it_packed->m_size;
+
+		it_packed++;
+	}
+
+	writeHeader(m_openedBNPFile + ".tmp", OffsetFromBegining);
+	
+	CFile::deleteFile( m_openedBNPFile );
+	string src = m_openedBNPFile + ".tmp";
+	CFile::moveFile( m_openedBNPFile.c_str(), src.c_str() );
+}
+// ***************************************************************************
+void BNPFileHandle::deleteFiles( const vector<string>& fileNames)
+{
+	vector<string>::const_iterator it_vec;
+	TPackedFilesList::iterator it_packed;
+	uint32 OffsetFromBegining = 0;
+	string tmpFile = m_openedBNPFile + ".tmp";
+
+	// create a new temporary bnp file with extension *.tmp
+	it_packed = m_packedFiles.begin();
+	while (it_packed != m_packedFiles.end() )
+	{
+		// check each packed file if it should be deleted
+		it_vec = find (fileNames.begin(), fileNames.end(), it_packed->m_name );
+		if ( it_vec != fileNames.end() )
+		{
+			nlinfo("Deleting file %s.", it_packed->m_name.c_str() );
+			it_packed = m_packedFiles.erase(it_packed);
+		}
+		else
+		{
+			append(tmpFile, *it_packed);
+			// Set now the new offset for the new header
+			it_packed->m_pos = OffsetFromBegining;
+			OffsetFromBegining += it_packed->m_size;
+
+			it_packed++;
+		}
+	}
+
+	writeHeader(tmpFile, OffsetFromBegining);
+	
+	CFile::deleteFile( m_openedBNPFile );
+	string src = m_openedBNPFile + ".tmp";
+	CFile::moveFile( m_openedBNPFile.c_str(), src.c_str() );
+}
+// ***************************************************************************
+void BNPFileHandle::append(const string &destination, const PackedFile &source)
+{
+	// check if the file exists and create one if not
+	if ( !CFile::fileExists(destination) )
+		CFile::createEmptyFile( destination );
+
+	COFile bnpfile;
+	CIFile packedfile; 
+	bnpfile.open(destination, true);
+	packedfile.open(source.m_path);
+	if ( !bnpfile.isOpen() ) return;
+
+	
+	uint8 *ptr = new uint8[source.m_size];
+
+	// check if the source is a bnp file.
+	if ( nlstricmp( CFile::getExtension(source.m_path), "bnp" ) == 0 )
+	{
+		// Jump to the file position inside the bnp
+		packedfile.seek(source.m_pos, IStream::begin);
+	}
+	// Read the source
+	packedfile.serialBuffer(ptr, source.m_size);
+
+	// Append the data to the destination
+	bnpfile.serialBuffer(ptr, source.m_size);
+
+	delete [] ptr;
+	
+	packedfile.close();
+	bnpfile.close();
+}
+// ***************************************************************************
+bool BNPFileHandle::compare(const PackedFile &left, const PackedFile &right)
+{
+	return nlstricmp (left.m_name.c_str(), right.m_name.c_str()) < 0;
+}
+} // namespace BNPManager

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h

@@ -0,0 +1,139 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_FILE_H
+#define BNP_FILE_H
+
+// Project includes
+
+// Nel includes
+#include "nel/misc/types_nl.h"
+#include <nel/misc/singleton.h>
+
+// Qt includes
+#include <QString>
+
+
+namespace BNPManager 
+{
+
+struct PackedFile
+{
+	PackedFile();
+	std::string m_name;
+	uint32 m_size;
+	uint32 m_pos;
+	std::string m_path;
+};
+
+typedef std::vector<PackedFile> TPackedFilesList;
+
+class BNPFileHandle
+{
+	NLMISC_SAFE_SINGLETON_DECL(BNPFileHandle)
+
+	/**
+	 * Private constructor
+	 */
+	BNPFileHandle();
+
+	/**
+	 * Private destructor
+	 */
+	~BNPFileHandle();
+
+public:
+	// release memory
+	static void releaseInstance();
+
+	/*void append (const QString destFilename, const QString origFilename, uint32 sizeToRead);
+	void packRecurse();*/
+
+	/**
+	 * Read the header from the bnp file and create a filelist
+	 * \param filename (consisting the whole path)
+	 */
+	bool readHeader (const std::string &filePath);
+
+	bool writeHeader (const std::string &filePath, uint32 offset);
+
+	/**
+	 * Append the header to a created bnp file
+	 * \param filename (consisting the whole path)
+	 */
+	void appendHeader (const std::string &filename) {};
+
+	/**
+	 * Create a vector of all packed files inside the bnp file
+	 * \param reference to the vector, which has to be filled
+	 */
+	void list (TPackedFilesList& FileList);
+
+	/**
+	 * Create a vector of all file names inside the bnp file
+	 * \param reference to the vector, which has to be filled
+	 */
+	void fileNames( std::vector<std::string>& fileNames );
+
+	/**
+	 * Add files to the current aktive bnp file
+	 * \param vector of file pathes to add
+	 */
+	void addFiles( const std::vector<std::string>& filePathes );
+
+	/**
+	 * Delete files from the current aktive bnp file
+	 * \param vector of files names
+	 */
+	void deleteFiles (const std::vector<std::string>& fileNames);
+	
+	/**
+	 * Unpack the selected packed files into user defined dir
+	 * \param directory path, where the files should be unpacked
+	 * \param list of files, which has to be unpacked
+	 */
+	bool unpack (const std::string &dirName, const std::vector<std::string>& fileList);
+
+	/**
+	 * Compares two filenames
+	 * \param left: left packed file
+	 * \param right: right packed file
+	 * \return: TODO
+	 */
+	static bool compare(const PackedFile &left, const PackedFile &right);
+
+private:
+
+	/**
+	 * Append one file to an existing bnp file
+	 * \param destination: the active bnp file to append the file
+	 * \param source: the source file to pack
+	 */
+	void append( const std::string& destination, const PackedFile& source );
+
+	TPackedFilesList		m_packedFiles;
+
+	// currently opened and displayed bnp file
+	std::string				m_openedBNPFile;
+
+	// offset where the header of the bnp file begins
+	uint32					m_offsetFromBeginning;
+
+};
+
+}
+
+#endif

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.cpp

@@ -0,0 +1,145 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_filelist_dialog.h"
+#include "bnp_file.h"
+
+// Qt includes
+#include <QtGui/QWidget>
+#include <QDragEnterEvent>
+#include <QMimeData>
+#include <QUrl>
+#include <QEvent>
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+using namespace std;
+
+namespace BNPManager
+{
+
+BnpFileListDialog::BnpFileListDialog(QString bnpPath, QWidget *parent)
+	:	QDockWidget(parent),
+		m_DataPath(bnpPath)
+{
+	m_ui.setupUi(this);
+	setAcceptDrops(true);
+}
+// ***************************************************************************
+BnpFileListDialog::~BnpFileListDialog()
+{
+
+}
+// ***************************************************************************
+void BnpFileListDialog::setupTable(int nbrows)
+{
+	// delete all old entries
+	m_ui.tableWidget->clear();
+
+	// set 2 colums: filename and size
+	m_ui.tableWidget->setColumnCount(2);
+
+	// set number of rows according to the number of files in the bnp file
+	m_ui.tableWidget->setRowCount(nbrows);
+
+	// only entire rows can be selected
+	m_ui.tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+	
+	// set the horizontal headers
+	QStringList labels;
+	labels << tr("Filename") << tr("Size");
+	m_ui.tableWidget->setHorizontalHeaderLabels(labels);
+
+	m_ui.tableWidget->horizontalHeader()->setResizeMode(0, QHeaderView::Interactive);
+	m_ui.tableWidget->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch );
+	m_ui.tableWidget->verticalHeader()->hide();
+
+	// set vertical size a little bit smaller
+	m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(15);
+	m_ui.tableWidget->setShowGrid(false);
+    m_ui.tableWidget->setObjectName("tablewidget");
+}
+// ***************************************************************************
+bool BnpFileListDialog::loadTable(const QString filePath)
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+	// string vector of all packed files inside a bnp
+	TPackedFilesList filelist;
+	int row = 0;
+
+	// read the header from the bnp file
+	if (!myBNPFileHandle.readHeader( filePath.toStdString()) )
+	{
+		return false;
+	}
+	myBNPFileHandle.list( filelist );
+
+	// create table with number of rows
+	setupTable(filelist.size());
+
+	// fill the table items
+	TPackedFilesList::iterator it = filelist.begin();
+	while (it != filelist.end() )
+	{
+		QTableWidgetItem *nameItem = new QTableWidgetItem (it->m_name.c_str() );
+		QTableWidgetItem *sizeItem = new QTableWidgetItem (tr("%1 KB").arg(it->m_size));
+		m_ui.tableWidget->setItem(row, 0, nameItem);
+		m_ui.tableWidget->setItem(row, 1, sizeItem);
+		it++;
+		row++;
+	}
+
+	// Set the file path as the widgets title
+	setWindowTitle(filePath);
+
+	return true;
+}
+// ***************************************************************************
+void BnpFileListDialog::getSelections(TSelectionList& SelectionList)
+{
+	QModelIndex index;
+	QAbstractItemModel *model = m_ui.tableWidget->model();
+	QItemSelectionModel *selection = m_ui.tableWidget->selectionModel();
+	QModelIndexList indexes = selection->selectedRows();
+
+	Q_FOREACH(index, indexes)
+	{
+		QVariant data = model->data(index);
+		QString filename = data.toString();
+		SelectionList.push_back( filename.toStdString() );
+	}
+}
+// ***************************************************************************
+void BnpFileListDialog::dragEnterEvent(QDragEnterEvent *event)
+{
+	// Accept only one file
+	// In the future a tabbed FileListDialog would accept more
+	if ( event->mimeData()->hasUrls() && event->mimeData()->urls().count() == 1)
+		event->acceptProposedAction();
+}
+// ***************************************************************************
+void BnpFileListDialog::dropEvent(QDropEvent *event)
+ {
+	// Excraft the local file url from the drop object and fill the table
+	const QMimeData *mimeData = event->mimeData();
+	QList<QUrl> urlList = mimeData->urls();
+	loadTable( urlList.first().toLocalFile() );
+ }
+
+} // namespace BNPManager

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.h

@@ -0,0 +1,83 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_FILELIST_DIALOG_H
+#define BNP_FILELIST_DIALOG_H
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// STL includes
+#include <vector>
+#include <string>
+
+// NeL includes
+
+// Project includes
+#include "ui_bnp_filelist_dialog.h"
+
+namespace BNPManager
+{
+
+typedef std::vector<std::string> TSelectionList;
+
+class BnpFileListDialog : public QDockWidget
+{
+	Q_OBJECT
+
+public:
+
+	// Constructor
+	BnpFileListDialog(QString bnpPath, QWidget *parent = 0);
+
+	// Destructor
+	~BnpFileListDialog();
+
+	/**
+	 * Load the bnp file and setup the table view
+	 * \param Filename
+	 * \return true if everything went well
+	 */
+	bool loadTable(const QString filePath);
+
+	/**
+	 * Set the dimension of the table
+	 * \param number of rows
+	 */
+	void setupTable(int nbrows);
+
+	/**
+	 * Fill the files selected in the table view to
+	 * unpack them.
+	 * \param reference to a vector of filenames.
+	 * \return true if everything went well
+	 */
+	void getSelections(TSelectionList& SelectionList);
+
+protected:
+	void dragEnterEvent (QDragEnterEvent *event);
+	void dropEvent(QDropEvent *event);
+private:
+	Ui::BnpFileListDialog m_ui;
+
+	// common data path as root folder for the dirtree view
+	QString m_DataPath;
+
+};
+
+}
+
+#endif

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.ui

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BnpFileListDialog</class>
+ <widget class="QDockWidget" name="BnpFileListDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>141</height>
+   </size>
+  </property>
+  <property name="acceptDrops">
+   <bool>true</bool>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+  </property>
+  <property name="windowTitle">
+   <string>BNP File List</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="minimumSize">
+    <size>
+     <width>50</width>
+     <height>0</height>
+    </size>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QTableWidget" name="tableWidget">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <property name="showGrid">
+       <bool>false</bool>
+      </property>
+      <attribute name="horizontalHeaderMinimumSectionSize">
+       <number>15</number>
+      </attribute>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../../object_viewer_qt.qrc"/>
+  <include location="../core/core.qrc"/>
+  <include location="bnp_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.cpp

@@ -0,0 +1,51 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+#include "bnp_filesystem_model.h"
+
+#include <QApplication>
+#include <QStyle>
+
+namespace BNPManager
+{
+
+BNPFileSystemModel::BNPFileSystemModel(QObject *parent)
+	: QFileSystemModel(parent)
+{
+}
+// ***************************************************************************
+BNPFileSystemModel::~BNPFileSystemModel()
+{
+
+}
+// ***************************************************************************
+int BNPFileSystemModel::columnCount(const QModelIndex &) const
+{
+	return 1;
+}
+// ***************************************************************************
+QVariant BNPFileSystemModel::data(const QModelIndex& index, int role) const
+{
+
+	if (role == Qt::DecorationRole)
+	{
+		if (isDir(index))
+			return QApplication::style()->standardIcon(QStyle::SP_DirIcon);
+	}
+	return QFileSystemModel::data(index, role);
+}
+// ***************************************************************************
+} // namespace BNPManager

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.h

@@ -0,0 +1,49 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+#ifndef BNP_FILESYSTEM_MODEL_H
+#define BNP_FILESYSTEM_MODEL_H
+
+#include <QtGui/QFileSystemModel>
+
+namespace BNPManager
+{
+
+class BNPFileSystemModel : public QFileSystemModel
+{
+	Q_OBJECT
+
+public:
+
+	/**
+	 * Constructor
+	 */
+	BNPFileSystemModel(QObject *parent = 0);
+
+	/**
+	 * Destructor
+	 */
+	~BNPFileSystemModel();
+
+	int columnCount(const QModelIndex &) const;
+
+	QVariant data(const QModelIndex& index, int role) const ;
+
+};
+
+}
+
+#endif

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager.qrc

@@ -0,0 +1,9 @@
+<RCC>
+  <qresource>
+    <file>images/ic_nel_bnp_make.png</file>
+	<file>images/ic_nel_delete_item.png</file>
+	<file>images/ic_nel_add_item.png</file>
+	<file>images/ic_nel_export.png</file>
+	<file>images/ic_nel_reset_all.png</file>
+  </qresource>
+</RCC>

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_constants.h

@@ -0,0 +1,37 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_MANAGER_CONSTANTS_H
+#define BNP_MANAGER_CONSTANTS_H
+
+namespace BNPManager
+{
+namespace Constants
+{
+//settings
+const char * const BNP_MANAGER_SECTION = "BNPManager";
+
+//resources
+const char *const ICON_ADD = ":/images/ic_nel_add_item.png";
+const char *const ICON_DELETE = ":/images/ic_nel_delete_item.png";
+const char *const ICON_UNPACK = ":/images/ic_nel_export.png";
+const char *const ICON_CLOSE = ":/images/ic_nel_reset_all.png";
+
+
+} // namespace Constants
+} // namespace Plugin
+
+#endif

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.cpp

@@ -0,0 +1,89 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_manager_plugin.h"
+#include "bnp_manager_window.h"
+
+#include "../core/icore.h"
+#include "../core/core_constants.h"
+#include "../core/menu_manager.h"
+
+// NeL includes
+#include "nel/misc/debug.h"
+
+// Qt includes
+#include <QtCore/QObject>
+#include <QtGui/QMainWindow>
+
+namespace BNPManager
+{
+
+	BNPManagerPlugin::BNPManagerPlugin()
+	{
+	}
+	
+	BNPManagerPlugin::~BNPManagerPlugin()
+	{
+		Q_FOREACH(QObject *obj, m_autoReleaseObjects)
+		{
+			m_plugMan->removeObject(obj);
+		}
+		qDeleteAll(m_autoReleaseObjects);
+		m_autoReleaseObjects.clear();
+	}
+
+bool BNPManagerPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
+{
+    Q_UNUSED(errorString);
+    m_plugMan = pluginManager;
+
+    addAutoReleasedObject(new BNPManagerContext(this));
+    return true;
+}
+
+void BNPManagerPlugin::extensionsInitialized()
+{
+}
+
+void BNPManagerPlugin::shutdown()
+{
+
+}
+
+void BNPManagerPlugin::setNelContext(NLMISC::INelContext *nelContext)
+{
+#ifdef NL_OS_WINDOWS
+    // Ensure that a context doesn't exist yet.
+    // This only applies to platforms without PIC, e.g. Windows.
+    nlassert(!NLMISC::INelContext::isContextInitialised());
+#endif // NL_OS_WINDOWS
+    m_libContext = new NLMISC::CLibraryContext(*nelContext);
+}
+
+void BNPManagerPlugin::addAutoReleasedObject(QObject *obj)
+{
+    m_plugMan->addObject(obj);
+    m_autoReleaseObjects.prepend(obj);
+}
+
+/*void BNPManagerContext::open()
+{
+    m_BnpManagerWindow->open();
+}*/
+}
+
+Q_EXPORT_PLUGIN(BNPManager::BNPManagerPlugin)

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.h

@@ -0,0 +1,130 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_MANAGER_PLUGIN_H
+#define BNP_MANAGER_PLUGIN_H
+
+// Project includes
+#include "../../extension_system/iplugin.h"
+#include "../core/icontext.h"
+#include "bnp_manager_window.h"
+
+// NeL includes
+#include "nel/misc/app_context.h"
+#include <nel/misc/debug.h>
+
+// Qt includes
+#include <QtCore/QObject>
+#include <QtGui/QIcon>
+
+namespace NLMISC
+{
+class CLibraryContext;
+}
+
+namespace ExtensionSystem
+{
+class IPluginSpec;
+}
+
+namespace BNPManager
+{
+class m_BnpManagerWindow;
+
+class BNPManagerPlugin : public QObject, public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES(ExtensionSystem::IPlugin)
+
+public:
+	BNPManagerPlugin();
+    virtual ~BNPManagerPlugin();
+
+    virtual bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
+    virtual void extensionsInitialized();
+    virtual void shutdown();
+    virtual void setNelContext(NLMISC::INelContext *nelContext);
+
+    void addAutoReleasedObject(QObject *obj);
+
+protected:
+
+    NLMISC::CLibraryContext *m_libContext;
+
+private:
+
+    ExtensionSystem::IPluginManager *m_plugMan;
+    QList<QObject *> m_autoReleaseObjects;
+};
+
+/**
+ * Implementation of the IContext interface
+ *
+ * \date 2011
+ */
+
+class BNPManagerContext : public Core::IContext
+{
+    Q_OBJECT
+
+public:
+	// Constructor
+	BNPManagerContext(QObject *parent = 0) : IContext(parent)
+	{
+		// run new manager window app
+		m_BnpManagerWindow = new BNPManagerWindow();
+	}
+
+	// Destructor
+    virtual ~BNPManagerContext() {}
+
+    virtual QString id() const
+    {
+        return QLatin1String("BNPManagerContext");
+    }
+    virtual QString trName() const
+    {
+        return tr("BNP Manager");
+    }
+    virtual QIcon icon() const
+    {
+        return QIcon(":/images/ic_nel_bnp_make.png");
+    }
+
+    virtual void open()
+	{
+		m_BnpManagerWindow->open();
+	}
+
+    virtual QUndoStack *undoStack()
+	{
+		return m_BnpManagerWindow->m_undoStack;
+	}
+
+    virtual QWidget *widget()
+	{
+		return m_BnpManagerWindow;
+	}
+
+    BNPManagerWindow *m_BnpManagerWindow;
+
+};
+
+} // namespace Plugin
+
+
+
+#endif // BNP_MANAGER_PLUGIN_H

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.cpp

@@ -0,0 +1,291 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_manager_window.h"
+#include "bnp_manager_constants.h"
+#include "bnp_dirtree_dialog.h"
+#include "bnp_filelist_dialog.h"
+#include "bnp_file.h"
+
+#include "../core/icore.h"
+#include "../core/menu_manager.h"
+#include "../core/core_constants.h"
+#include "../../extension_system/iplugin_spec.h"
+
+// NeL includes
+#include <nel/misc/debug.h>
+#include <nel/misc/path.h>
+
+// Qt includes
+#include <QDebug>
+#include <QFileDialog>
+#include <QToolBar>
+#include <QTableWidget>
+#include <QMessageBox>
+#include <QSettings>
+
+using namespace std;
+using namespace NLMISC;
+
+
+namespace BNPManager
+{
+
+BNPManagerWindow::BNPManagerWindow(QWidget *parent)
+    :   QMainWindow(parent)
+{
+    // add new mainwindow for sheet dockwidgets
+	QTableWidget* hideWidget = new QTableWidget(0,0,this);
+	setCentralWidget(hideWidget);
+	hideWidget->hide();
+
+	// Read the settings
+	readSettings();
+	
+	// create main dialogs and display them
+	createDialogs();
+
+	// create actions like open, close, add etc.
+	createActions();
+
+	// create a toolbar with icons
+	createToolBars();
+	
+	// this SLOT is triggered if the user activates a bnp files in the 
+	// dirtree view
+	connect(m_BnpDirTreeDialog, SIGNAL(selectedFile(const QString)), 
+			this, SLOT(loadFile(const QString)));
+
+	// not used
+    m_undoStack = new QUndoStack(this);
+}
+// ***************************************************************************
+BNPManagerWindow::~BNPManagerWindow()
+{
+	writeSettings();
+}
+// ***************************************************************************
+void BNPManagerWindow::createDialogs()
+{
+	// create dialog to list the contents of the specified
+	// bnp data file directory
+	m_BnpDirTreeDialog = new CBnpDirTreeDialog(tr(m_DataPath.toStdString().c_str()),this);
+	addDockWidget(Qt::LeftDockWidgetArea, m_BnpDirTreeDialog);
+	m_BnpDirTreeDialog->setVisible(true);
+	restoreDockWidget(m_BnpDirTreeDialog);
+
+	// create dialog to list the packed file contents of bnp files on
+	// the right hand side
+	m_BnpFileListDialog = new BnpFileListDialog(m_DataPath,this);
+	addDockWidget(Qt::RightDockWidgetArea, m_BnpFileListDialog);
+	m_BnpFileListDialog->setVisible(true);
+	restoreDockWidget(m_BnpFileListDialog);
+}
+// ***************************************************************************
+void BNPManagerWindow::createActions()
+{
+	// open action
+	m_openAction = new QAction(tr("&Open..."), this);
+	m_openAction->setIcon(QIcon(Core::Constants::ICON_OPEN));
+    m_openAction->setStatusTip(tr("Open file"));
+	connect(m_openAction, SIGNAL(triggered()), this, SLOT( open() ));
+
+	// close action
+    m_closeAction = new QAction(tr("&Close..."), this);
+	m_closeAction->setIcon(QIcon(Constants::ICON_CLOSE));
+    m_closeAction->setStatusTip(tr("Close the BNP File"));
+    connect(m_closeAction, SIGNAL(triggered()), this, SLOT( close() ));
+
+	// add files into the bnp file
+    m_addFilesAction = new QAction(tr("&Add..."), this);
+	m_addFilesAction->setIcon(QIcon(Constants::ICON_ADD));
+    m_addFilesAction->setStatusTip(tr("Add Files to BNP"));
+    connect(m_addFilesAction, SIGNAL(triggered()), this, SLOT( addFiles() ));
+
+	// delete files from the bnp file
+    m_deleteFilesAction = new QAction(tr("&Delete..."), this);
+    m_deleteFilesAction->setIcon(QIcon(Constants::ICON_DELETE));
+    m_deleteFilesAction->setStatusTip(tr("Delete Files"));
+    connect(m_deleteFilesAction, SIGNAL(triggered()), this, SLOT( deleteFiles() ));
+
+	// unpack selected files into user defined dir
+    m_unpackFilesAction = new QAction(tr("&Unpack..."), this);
+	m_unpackFilesAction->setIcon(QIcon(Constants::ICON_UNPACK));
+    m_unpackFilesAction->setStatusTip(tr("Unpack Files"));
+    connect(m_unpackFilesAction, SIGNAL(triggered()), this, SLOT( unpackFiles() ));
+}
+// ***************************************************************************
+void BNPManagerWindow::createToolBars()
+{
+	m_fileToolBar = addToolBar(tr("&File"));
+	m_fileToolBar->addAction(m_openAction);
+	m_fileToolBar->addAction(m_closeAction);
+
+	m_toolsBar = addToolBar(tr("&Tools"));
+	m_toolsBar->addAction(m_addFilesAction);
+	m_toolsBar->addAction(m_deleteFilesAction);
+	m_toolsBar->addAction(m_unpackFilesAction);
+}
+// ***************************************************************************
+bool BNPManagerWindow::loadFile(const QString fileName)
+{
+	m_BnpFileListDialog->loadTable(fileName);
+	return true;
+}
+// ***************************************************************************
+void BNPManagerWindow::open()
+{
+	QString fileName;
+	// file dialog to select with file should be opened
+	fileName = QFileDialog::getOpenFileName(this,
+		tr("Open BNP file"), tr(m_DataPath.toStdString().c_str()), tr("BNP Files (*.bnp)"));
+
+	// Check if filename is empty
+	if (fileName.isNull())
+		return;
+
+	m_openedBNPFile = fileName;
+    loadFile(fileName);
+}
+// ***************************************************************************
+void BNPManagerWindow::close()
+{
+    //TODO
+}
+// ***************************************************************************
+void BNPManagerWindow::addFiles()
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+
+	// vector of all current packed filenames
+	vector<string> currentFiles;
+
+	// vector of files to add
+	vector<string> addFiles;
+
+    // open a file dialog and to add files
+	QStringList FileList;
+
+	FileList = QFileDialog::getOpenFileNames(this,tr("Add Files..."),
+							QDir::currentPath(), tr("All Files (*.*)") );
+	
+	// get all current filenames from the opened bnp file
+	myBNPFileHandle.fileNames(currentFiles);
+
+	QStringList::iterator it_list = FileList.begin();
+	while (it_list != FileList.end() )
+	{
+		string fileName = CFile::getFilename (it_list->toStdString() );
+		if ( std::find(currentFiles.begin(), currentFiles.end(), fileName ) !=  currentFiles.end() )
+		{
+			// Ask the user if he wants to override the existing file
+			// atm only warn the user and do not override
+			QMessageBox::warning(this, tr("BNP Manager"),
+                                tr("File is already in the list!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		}
+		else
+		{
+			addFiles.push_back( it_list->toStdString() );
+			// log it
+			nlinfo("Add file %s", fileName.c_str() );
+		}
+		it_list++;
+	}
+	
+	if ( !addFiles.empty() )
+	{
+		myBNPFileHandle.addFiles( addFiles );
+	}
+	loadFile(m_openedBNPFile);
+}
+// ***************************************************************************
+void BNPManagerWindow::deleteFiles()
+{
+    QFileDialog filedialog(this);
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+	vector<string> selectedRows;
+
+	m_BnpFileListDialog->getSelections(selectedRows);
+
+	// Check if files were selected. If not, inform the user.
+	if (selectedRows.empty())
+	{
+		QMessageBox::information(this, tr("BNP Manager"),
+                                tr("No files selected!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		return;
+	}
+	
+	myBNPFileHandle.deleteFiles(selectedRows);
+	loadFile(m_openedBNPFile);
+}
+// ***************************************************************************
+void BNPManagerWindow::unpackFiles()
+{
+	QFileDialog filedialog(this);
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+	vector<string> selectedrows;
+
+	m_BnpFileListDialog->getSelections(selectedrows);
+
+	// Check if files were selected. If not, inform the user.
+	// TODO: Ask the user if nothing was selected, if he wants to unpack all
+	// files. This is more like Winzip.
+	if (selectedrows.empty())
+	{
+		QMessageBox::information(this, tr("BNP Manager"),
+                                tr("No files selected!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		return;
+	}
+
+	QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+								tr(m_DataPath.toStdString().c_str()),
+								QFileDialog::ShowDirsOnly
+								| QFileDialog::DontResolveSymlinks);
+
+	// If anything went wrong or the user pressed "cancel"
+	if ( dir.isEmpty() )
+		return;
+	
+	if (myBNPFileHandle.unpack(dir.toStdString(),selectedrows))
+	{
+		QMessageBox::information(this, tr("BNP Manager"),
+                                tr("All files has been exported successfully."),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+	}
+}
+// ***************************************************************************
+void BNPManagerWindow::readSettings()
+{
+	QSettings *settings = Core::ICore::instance()->settings();
+
+	settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
+	m_DataPath = settings->value(Core::Constants::ASSETS_PATH, "w:/database").toString();
+	settings->endGroup();
+}
+// ***************************************************************************
+void BNPManagerWindow::writeSettings()
+{
+}
+} // namespace BNPManager

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.h

@@ -0,0 +1,145 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_MANAGER_WINDOW_H
+#define BNP_MANAGER_WINDOW_H
+
+// Project includes
+//#include "ui_bnp_manager_window.h"
+
+// Qt includes
+#include <QtGui/QMainWindow>
+#include <QtGui/QLabel>
+#include <QtGui/QUndoStack>
+#include <QtGui/QTableWidget>
+
+
+namespace BNPManager
+{
+
+class CBnpDirTreeDialog;
+class BnpFileListDialog;
+class BNPFileHandle;
+
+/**
+ * Main window class. Derived from QMainWindow and implements 
+ * the basic layout like menue, toolbars and dialogs.
+ *
+ * \date 2011
+ */
+
+class BNPManagerWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+
+	// Constructor
+    BNPManagerWindow(QWidget *parent = 0);
+
+	//Destructor
+    ~BNPManagerWindow();
+
+
+    QUndoStack *m_undoStack;
+
+public Q_SLOTS:
+
+	/**
+	 * Open a file dialog to choose which file should be opened.
+	 * \return Filename string 
+	 */
+    void open();
+
+	/**
+	 * Load a certain bnp file into the manager
+	 * \param Filename
+	 * \return true if everything went well
+	 */
+	bool loadFile(const QString fileName);
+
+	/**
+	 * close an opened bnp file and reset all views
+	 */
+    void close();
+
+	/**
+	 * Add files into an opened bnp file.
+	 * \param Filelist
+	 */
+    void addFiles();
+
+	/**
+	 * Unpack the files marked in the filelist dialog into user defined 
+	 * directory.
+	 * \param TBD
+	 * \return true if everything went well
+	 */
+    void unpackFiles();
+
+	/**
+	 * Delete marked files from the bnp file
+	 * \param TBD
+	 */
+    void deleteFiles();
+
+private:
+
+	/**
+	 * Read plugin settings and set the window accordingly
+	 */
+	void readSettings();
+
+	/**
+	 * Write plugin settings
+	 */
+	void writeSettings();
+
+	/**
+	 * Create all plugin dialogs
+	 */
+	void createDialogs();
+
+	/**
+	 * Create all plugin actions
+	 */
+	void createActions();
+
+	/**
+	 * Create the plugin toolbar
+	 */
+	void createToolBars();
+
+	QToolBar *m_fileToolBar;
+	QToolBar *m_toolsBar;
+
+    QAction *m_openAction;
+    QAction *m_closeAction;
+    QAction *m_addFilesAction;
+    QAction *m_unpackFilesAction;
+    QAction *m_deleteFilesAction;
+
+	CBnpDirTreeDialog *m_BnpDirTreeDialog;
+	BnpFileListDialog *m_BnpFileListDialog;
+
+	QString m_DataPath;
+	QString m_openedBNPFile;
+
+}; /* class BNPManagerWindow */
+
+} /* namespace Plugin */
+
+#endif

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.ui

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BNPManagerWindow</class>
+ <widget class="QMainWindow" name="BNPManagerWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>BNP Manager</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <property name="styleSheet">
+    <string notr="true">QWidget#centralwidget {
+	image: url(:/images/ic_nel_georges_editor.png);
+ }</string>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="1">
+     <widget class="QTableWidget" name="tableWidget"/>
+    </item>
+    <item row="0" column="0">
+     <widget class="QTreeView" name="treeView"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+ </widget>
+ <resources>
+  <include location="bnp_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.cpp

@@ -0,0 +1,56 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+// project includes
+#include "bnp_proxy_model.h"
+
+namespace BNPManager 
+{
+
+bool BNPSortProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+	if ( sourceModel()->hasChildren(left) )
+	{
+		if ( !sourceModel()->hasChildren(right) )
+		{
+			return true;
+		}
+		else
+		{
+			QString leftString = sourceModel()->data( left ).toString();
+			QString rightString = sourceModel()->data( right ).toString();
+			return QString::localeAwareCompare(leftString, rightString) < 0;
+		}
+	}
+	else
+	{
+		if ( sourceModel()->hasChildren(right) )
+			return false;
+		else
+		{
+			QString leftString = sourceModel()->data( left ).toString();
+			QString rightString = sourceModel()->data( right ).toString();
+			return QString::localeAwareCompare(leftString, rightString) < 0;
+		}
+	}
+}
+
+} /* namespace Plugin */
+
+/* end of file */

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.h

@@ -0,0 +1,44 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+#ifndef BNP_PROXY_MODEL_H
+#define BNP_PROXY_MODEL_H
+
+// Qt includes
+#include <QSortFilterProxyModel>
+
+namespace BNPManager 
+{
+
+	class BNPSortProxyModel : public QSortFilterProxyModel
+	{
+
+	public:
+		BNPSortProxyModel(QObject *parent = 0): QSortFilterProxyModel(parent)
+		{
+		}
+		~BNPSortProxyModel() 
+		{
+		}
+
+	protected:
+		virtual bool 	lessThan ( const QModelIndex & left, const QModelIndex & right ) const;
+
+	};/* class BNPSortProxyModel */
+
+} // BNPManager
+
+#endif // BNP_PROXY_MODEL_H

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_bnp_manager</library-name>
+    <name>BNPManager</name>
+    <version>0.1</version>
+    <vendor>Krolock</vendor>
+    <description>Edit BNP Files</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_form.ui

@@ -91,7 +91,7 @@
       <item>
        <widget class="QPushButton" name="bankButton">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.cpp

@@ -186,12 +186,11 @@ void CAttribWidget::changeUseScheme(int index)
 
 void CAttribWidget::openSchemeBankDialog()
 {
-	CSchemeBankDialog *dialog = new CSchemeBankDialog(this);
+	CSchemeBankDialog dialog(this);
-	dialog->setModal(true);
+	dialog.setModal(true);
-	dialog->show();
+	dialog.show();
-	dialog->exec();
+	dialog.exec();
-	delete dialog;
+	updateUi();
-	//updateUi();
 }
 
 void CAttribWidget::inputValueUpdate(void)

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.h

@@ -58,7 +58,7 @@ public:
 	/// Force to update dialog content
 	void updateUi();
 
-	/// Сonnects all the slots with signals
+	/// Connects all the slots with signals
 	void init();
 
 	/// Sets the pointer CWorkspaceNode* in the wrappers.
@@ -192,6 +192,7 @@ protected:
 	QDialog *_SchemeWidget;
 
 	Ui::CAttribWidget _ui;
+	friend class CSchemeBankDialog;
 }; /* class CAttribWidget */
 
 /**

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_editor.cpp

@@ -73,11 +73,14 @@ void CParticleEditor::release()
 {
 	stop();
 	closeWorkspace();
+	delete _SchemeManager;
 }
 
 void CParticleEditor::setActiveNode(CWorkspaceNode *node)
 {
 	if (node == _ActiveNode) return;
+	if (node == 0)
+		_ActiveNode->getPSModel()->hide();
 	_ActiveNode = node;
 
 	bool wasRunning = _State == State::RunningSingle;

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_node.cpp

@@ -378,6 +378,7 @@ void CParticleWorkspace::removeNode(uint index)
 {
 	nlassert(index < _Nodes.size());
 	_Nodes[index] = NULL; // delete the smart-ptr target
+	delete _Nodes[index];
 	_Nodes.erase(_Nodes.begin() + index);
 	touch();
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_dialog.cpp

@@ -305,6 +305,8 @@ void CParticleWorkspaceDialog::customContextMenu()
 	_instanciateAction->setEnabled(stopped);
 	_savePSAction->setEnabled(stopped);
 	_saveAsPSAction->setEnabled(stopped);
+	_removeFromWSAction->setEnabled(stopped);
+	_clearContentAction->setEnabled(stopped);
 
 	popurMenu->exec(QCursor::pos());
 	delete popurMenu;
@@ -369,13 +371,14 @@ void CParticleWorkspaceDialog::clearContent()
 
 void CParticleWorkspaceDialog::removePS()
 {
-	if (_treeModel->getOwnerNode(_currentItem) == Modules::psEdit().getActiveNode())
+	CWorkspaceNode *node = _currentItem->getNode();
+	if (node == Modules::psEdit().getActiveNode())
 		Modules::psEdit().setActiveNode(NULL);
 
 	QModelIndex index = _ui.treeView->currentIndex();
 	_ui.treeView->setCurrentIndex(index.parent());
 	clickedItem(index.parent());
-	Modules::psEdit().getParticleWorkspace()->removeNode(static_cast<CParticleTreeItem *>(index.internalPointer())->getNode());
+	Modules::psEdit().getParticleWorkspace()->removeNode(node);
 	_treeModel->removeRows(index.row(), index.parent());
 }
 

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scheme_bank_dialog.cpp

@@ -17,8 +17,17 @@
 // Project includes
 #include "stdpch.h"
 #include "scheme_bank_dialog.h"
+#include "scheme_manager.h"
 #include "modules.h"
 
+// NeL includes
+#include <nel/misc/file.h>
+
+// Qt includes
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QMessageBox>
+
 namespace NLQT
 {
 
@@ -27,6 +36,16 @@ CSchemeBankDialog::CSchemeBankDialog(CAttribWidget *attribWidget, QWidget *paren
 {
 	_ui.setupUi(this);
 	_attribWidget = attribWidget;
+
+	connect(_ui.createButton, SIGNAL(clicked()), this, SLOT(createScheme()));
+	connect(_ui.currentButton, SIGNAL(clicked()), this, SLOT(setCurrentScheme()));
+	connect(_ui.removeButton, SIGNAL(clicked()), this, SLOT(removeScheme()));
+	connect(_ui.loadButton, SIGNAL(clicked()), this, SLOT(loadBank()));
+	connect(_ui.saveButton, SIGNAL(clicked()), this, SLOT(saveBank()));
+	connect(_ui.listWidget, SIGNAL(itemSelectionChanged()), this, SLOT(enableButtons()));
+	connect(_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(changeNameScheme(QListWidgetItem *)));
+
+	buildList();
 }
 
 CSchemeBankDialog::~CSchemeBankDialog()
@@ -35,27 +54,125 @@ CSchemeBankDialog::~CSchemeBankDialog()
 
 void CSchemeBankDialog::createScheme()
 {
+	bool ok;
+	QString text = QInputDialog::getText(this, tr("Insert new scheme"),
+										 tr("Set name:"), QLineEdit::Normal,
+										 "new scheme", &ok);
+	if (ok && !text.isEmpty())
+	{
+		NL3D::CPSAttribMakerBase *attribMakerBase = _attribWidget->getCurrentSchemePtr()->clone();
+		Modules::psEdit().getSchemeManager()->insertScheme(text.toStdString(), attribMakerBase);
+
+		CSchemeItem *item = new CSchemeItem(text, _ui.listWidget);
+		item->setUserData(attribMakerBase);
+		item->setFlags(Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+	}
 }
 
 void CSchemeBankDialog::setCurrentScheme()
 {
-		//SchemeManager.insertScheme(cn.getName(), getCurrentSchemePtr()->clone());
+	CSchemeItem *item = dynamic_cast<CSchemeItem *>(_ui.listWidget->currentItem());
+
+	NL3D::CPSAttribMakerBase *attrib = item->getUserData();
+	nlassert(attrib);
+
+	_attribWidget->setCurrentSchemePtr(attrib->clone());
+	_attribWidget->updateUi();
 }
 
 void CSchemeBankDialog::removeScheme()
 {
+	CSchemeItem *item = dynamic_cast<CSchemeItem *>(_ui.listWidget->currentItem());
+
+	NL3D::CPSAttribMakerBase *attrib = item->getUserData();
+	nlassert(attrib);
+	Modules::psEdit().getSchemeManager()->remove(attrib);
+	_ui.listWidget->removeItemWidget(item);
+	delete item;
+
+	if (_ui.listWidget->count() == 0)
+	{
+		_ui.currentButton->setEnabled(false);
+		_ui.removeButton->setEnabled(false);
+	}
 }
 
 void CSchemeBankDialog::saveBank()
 {
+	QString fileName = QFileDialog::getSaveFileName(this,
+					   tr("Save scheme bank file"), ".",
+					   tr("Scheme bank files (*.scb)"));
+
+	if (!fileName.isEmpty())
+	{
+		try
+		{
+			NLMISC::COFile iF;
+			iF.open(fileName.toStdString());
+			NLQT::CSchemeManager *schemeManager = Modules::psEdit().getSchemeManager();
+			iF.serial(*schemeManager);
+		}
+		catch (std::exception &e)
+		{
+			QMessageBox::critical(this, "Scheme manager", tr("Error saving scheme bank : %1").arg(e.what()));
+			return;
+		}
+	}
 }
 
 void CSchemeBankDialog::loadBank()
 {
+	QString fileName = QFileDialog::getOpenFileName(this,
+					   tr("Open scheme bank file"), ".",
+					   tr("Scheme bank files (*.scb)"));
+
+	if (!fileName.isEmpty())
+	{
+		NLQT::CSchemeManager sm;
+		try
+		{
+			NLMISC::CIFile iF;
+			iF.open(fileName.toStdString());
+			iF.serial(sm);
+			Modules::psEdit().getSchemeManager()->swap(sm);
+		}
+		catch (std::exception &e)
+		{
+			QMessageBox::critical(this, "Scheme manager", tr("Error loading scheme bank : %1").arg(e.what()));
+			return;
+		}
+		buildList();
+	}
+}
+
+void CSchemeBankDialog::changeNameScheme(QListWidgetItem *item)
+{
+	CSchemeItem *schemeItem = dynamic_cast<CSchemeItem *>(item);
+
+	NL3D::CPSAttribMakerBase *attrib = schemeItem->getUserData();
+	nlassert(attrib);
+
+	Modules::psEdit().getSchemeManager()->rename(attrib, item->text().toStdString());
+}
+
+void CSchemeBankDialog::enableButtons()
+{
+	_ui.currentButton->setEnabled(true);
+	_ui.removeButton->setEnabled(true);
 }
 
 void CSchemeBankDialog::buildList()
 {
+	_ui.listWidget->clear();
+	typedef std::vector<NLQT::CSchemeManager::TSchemeInfo> TSchemeVect;
+	static TSchemeVect schemes;
+	Modules::psEdit().getSchemeManager()->getSchemes(_attribWidget->getCurrentSchemePtr()->getType(), schemes);
+	for (TSchemeVect::const_iterator it = schemes.begin(); it != schemes.end(); ++it)
+	{
+		CSchemeItem *item = new CSchemeItem(it->first.c_str(), _ui.listWidget);
+		item->setUserData(it->second);
+		item->setFlags(Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+	}
 }
 
 } /* namespace NLQT */

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scheme_bank_dialog.h

@@ -27,12 +27,37 @@
 #include "nel/3d/particle_system.h"
 
 // Project includes
+#include "attrib_widget.h"
 #include "ps_wrapper.h"
 
 namespace NLQT
 {
 class CAttribWidget;
 
+/**
+@class CSchemeItem
+@brief Contain pointer to NL3D::CPSAttribMakerBase.
+*/
+class CSchemeItem: public QListWidgetItem
+{
+public:
+	CSchemeItem(const QString &text, QListWidget *parent = 0, int type = UserType ):
+		QListWidgetItem(text, parent, type), _attrib(NULL) {}
+
+	void setUserData(NL3D::CPSAttribMakerBase *attrib)
+	{
+		_attrib = attrib;
+	}
+	NL3D::CPSAttribMakerBase *getUserData() const
+	{
+		return _attrib;
+	}
+
+private:
+
+	NL3D::CPSAttribMakerBase *_attrib;
+}; /* class CSchemeItem */
+
 class CSchemeBankDialog: public QDialog
 {
 	Q_OBJECT
@@ -47,6 +72,8 @@ private Q_SLOTS:
 	void removeScheme();
 	void saveBank();
 	void loadBank();
+	void enableButtons();
+	void changeNameScheme(QListWidgetItem *item);
 
 private:
 	void buildList();

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scheme_bank_form.ui

@@ -14,31 +14,27 @@
    <string>Sceme bank</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" rowspan="8">
+   <item row="0" column="0" rowspan="7">
     <widget class="QListWidget" name="listWidget"/>
    </item>
    <item row="1" column="1">
     <widget class="QPushButton" name="createButton">
      <property name="text">
-      <string>Create</string>
+      <string>Put current</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="QPushButton" name="renameButton">
-     <property name="text">
-      <string>Rename</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
     <widget class="QPushButton" name="removeButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="text">
       <string>Remove</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="4" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -51,24 +47,33 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="1">
+   <item row="5" column="1">
     <widget class="QPushButton" name="loadButton">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="text">
       <string>Load bank</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="6" column="1">
     <widget class="QPushButton" name="saveButton">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="text">
       <string>Save bank</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="2">
+   <item row="7" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -105,7 +110,10 @@
     </layout>
    </item>
    <item row="2" column="1">
-    <widget class="QPushButton" name="setCurrentButton">
+    <widget class="QPushButton" name="currentButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="text">
       <string>Set current</string>
      </property>

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scheme_manager.cpp

@@ -80,12 +80,12 @@ void CSchemeManager::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 	}
 }
 
-void	CSchemeManager::swap(CSchemeManager &other)
+void CSchemeManager::swap(CSchemeManager &other)
 {
 	this->_SchemeMap.swap(other._SchemeMap);
 }
 
-void    CSchemeManager::remove(NL3D::CPSAttribMakerBase *am)
+void CSchemeManager::remove(NL3D::CPSAttribMakerBase *am)
 {
 	TSchemeMap::iterator smIt;
 	for (smIt = _SchemeMap.begin(); smIt != _SchemeMap.end(); ++smIt)
@@ -101,7 +101,7 @@ void    CSchemeManager::remove(NL3D::CPSAttribMakerBase *am)
 }
 
 // rename a scheme, given a pointer on it
-void  CSchemeManager::rename(NL3D::CPSAttribMakerBase *am, const std::string &newName)
+void CSchemeManager::rename(NL3D::CPSAttribMakerBase *am, const std::string &newName)
 {
 	TSchemeMap::iterator smIt;
 	for (smIt = _SchemeMap.begin(); smIt != _SchemeMap.end(); ++smIt)

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/CMakeLists.txt

@@ -10,25 +10,23 @@ SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.
 						${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
 
 SET(OVQT_PLUG_TRANSLATION_MANAGER_HDR 	translation_manager_plugin.h
-							translation_manager_main_window.h
+										translation_manager_main_window.h
-							translation_manager_settings_page.h
+										translation_manager_settings_page.h
-                                                                                                       translation_manager_editor.h
+										translation_manager_editor.h
-                                                                                                       source_selection.h
+										source_selection.h
-                                                                                                       ftp_selection.h
+										ftp_selection.h
-                                                                                                       editor_worksheet.h
+										editor_worksheet.h
-																									   editor_phrase.h
+										editor_phrase.h
-                                                                                                       extract_new_sheet_names.h
+)
-                                                                                                       extract_bot_names.h)
 
 SET(OVQT_PLUG_TRANSLATION_MANAGER_UIS	translation_manager_settings_page.ui
-                                                        translation_manager_main_window.ui
+										translation_manager_main_window.ui
-                                                        source_selection.ui
+										source_selection.ui
-                                                        ftp_selection.ui)
+										ftp_selection.ui)
 
 SET(OVQT_PLUG_TRANSLATION_MANAGER_RCS	ftp_selection.qrc)
 
 SET(QT_USE_QTGUI TRUE)
-SET(QT_USE_QTOPENGL TRUE)
 SET(QT_USE_QTNETWORK TRUE)
 
 QT4_WRAP_CPP(OVQT_PLUG_TRANSLATION_MANAGER_MOC_SRC ${OVQT_PLUG_TRANSLATION_MANAGER_HDR})
@@ -42,7 +40,7 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
 
 ADD_LIBRARY(ovqt_plugin_translation_manager MODULE ${SRC} ${OVQT_PLUG_TRANSLATION_MANAGER_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_TRANSLATION_MANAGER_UI_HDRS})
 
-TARGET_LINK_LIBRARIES(ovqt_plugin_translation_manager ovqt_plugin_core nelmisc nel3d nelligo nelgeorges ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
+TARGET_LINK_LIBRARIES(ovqt_plugin_translation_manager ovqt_plugin_core nelmisc nelligo nelgeorges ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
 
 NL_DEFAULT_PROPS(ovqt_plugin_translation_manager "NeL, Tools, 3D: Object Viewer Qt Plugin: Translation Manager")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_translation_manager)

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_phrase.cpp

@@ -1,5 +1,4 @@
 // Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
 // Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
@@ -15,32 +14,32 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+// Project includes
+#include "editor_phrase.h"
+#include "translation_manager_constants.h"
+
 // Nel includes
 #include "nel/misc/path.h"
 #include "nel/misc/diff_tool.h"
 
 // Qt includes
+#include <QtCore/QFileInfo>
+#include <QtCore/QByteArray>
+#include <QtCore/QTextCodec>
+#include <QtCore/QTextStream>
+#include <QtGui/QTextCursor>
 #include <QtGui/QErrorMessage>
-#include <QtCore/qfileinfo.h>
 #include <QtGui/QMessageBox>
 #include <QtGui/QCloseEvent>
-#include <QtCore/QByteArray>
-#include <QtCore/qtextcodec.h>
-#include <QtGui/QTextCursor>
-#include <QtCore/qtextstream.h>
-#include <QtCore/qtextcodec.h>
-
-// Project includes
-#include "editor_phrase.h"
-#include "translation_manager_constants.h"
 
 using namespace std;
 
-namespace TranslationManager {
+namespace TranslationManager
+{
 
 void CEditorPhrase::open(QString filename)
 {
-	vector<STRING_MANAGER::TPhrase> phrases;
+	std::vector<STRING_MANAGER::TPhrase> phrases;
 	if(readPhraseFile(filename.toStdString(), phrases, false))
 	{
 		text_edit = new CTextEdit(this);
@@ -58,21 +57,23 @@ void CEditorPhrase::open(QString filename)
 		text_edit->append(data);
 		// window settings
 		setCurrentFile(filename);
-        setAttribute(Qt::WA_DeleteOnClose);
+		setAttribute(Qt::WA_DeleteOnClose);
 		editor_type = Constants::ED_PHRASE;
 		current_file = filename;
 		connect(text_edit->document(), SIGNAL(contentsChanged()), this, SLOT(docContentsChanged()));
 		connect(text_edit->document(), SIGNAL(undoCommandAdded()), this, SLOT(newUndoCommandAdded()));
-	} else {
+	}
-        QErrorMessage error;
+	else
-        error.showMessage("This file is not a phrase file.");
+	{
-        error.exec();                             
+		QErrorMessage error;
-    }
+		error.showMessage("This file is not a phrase file.");
+		error.exec();
+	}
 }
 
 void CEditorPhrase::newUndoCommandAdded()
 {
-	 current_stack->push(new CUndoPhraseNewCommand(text_edit)); 
+	current_stack->push(new CUndoPhraseNewCommand(text_edit));
 }
 
 void CEditorPhrase::docContentsChanged()
@@ -97,44 +98,37 @@ void CEditorPhrase::saveAs(QString filename)
 	QTextStream out(&file);
 	out.setCodec("UTF-8");
 	out.setGenerateByteOrderMark(true);
-	out<<text_edit->toPlainText();
+	out << text_edit->toPlainText();
 	current_file = filename;
 	setCurrentFile(current_file);
 }
 
-
-
 void CEditorPhrase::closeEvent(QCloseEvent *event)
 {
-    if(isWindowModified())
+	if(isWindowModified())
-    {
+	{
-        QMessageBox msgBox;
+		QMessageBox msgBox;
-        msgBox.setText("The document has been modified.");
+		msgBox.setIcon(QMessageBox::Question);
-        msgBox.setInformativeText("Do you want to save your changes?");
+		msgBox.setText(tr("The document has been modified."));
-        msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+		msgBox.setInformativeText(tr("Do you want to save your changes?"));
-        msgBox.setDefaultButton(QMessageBox::Save);
+		msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-        int ret = msgBox.exec();
+		msgBox.setDefaultButton(QMessageBox::Save);
-        switch (ret) 
+
-        {
+		int ret = msgBox.exec();
-                case QMessageBox::Save:
+		switch (ret)
-                    save();
+		{
-                    event->accept();
+		case QMessageBox::Save:
-                    close();
+			save();
-                    break;
+			break;
-                case QMessageBox::Discard:
+		case QMessageBox::Discard:
-                    event->accept();
+			break;
-                    close();
+		case QMessageBox::Cancel:
-                    break;
+			event->ignore();
-                case QMessageBox::Cancel:
+			return;
-                    event->ignore();
+		}
-                    break;
+	}
-                default:
+	event->accept();
-                    break;
+	close();
-        }
-    } else {
-        event->accept();
-        close();
-    }
 }
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_phrase.h

@@ -18,6 +18,9 @@
 #ifndef EDITOR_PHRASE_H
 #define EDITOR_PHRASE_H
 
+// Project includes
+#include "translation_manager_editor.h"
+
 // Qt includes
 #include <QtCore/QObject>
 #include <QtCore/QFile>
@@ -32,23 +35,23 @@
 #include <QtGui/QErrorMessage>
 #include <QKeyEvent>
 
-// Project includes
+namespace TranslationManager
-#include "translation_manager_editor.h"
+{
-
-namespace TranslationManager {
 
 class CTextEdit : public QTextEdit
 {
 	Q_OBJECT
+
 private:
-	QUndoStack* m_undoStack;
+	QUndoStack *m_undoStack;
+
 public:
-	CTextEdit(QWidget* parent = 0) : QTextEdit(parent) 
+	CTextEdit(QWidget *parent = 0) : QTextEdit(parent)
 	{
 		setUndoRedoEnabled(true);
 	}
 	//void keyPressEvent(QKeyEvent *event);
-	void setUndoStack(QUndoStack* undoStack)
+	void setUndoStack(QUndoStack *undoStack)
 	{
 		m_undoStack = undoStack;
 	}
@@ -57,20 +60,22 @@ public:
 class CEditorPhrase : public CEditor
 {
 	Q_OBJECT
+
 public:
-	CTextEdit *text_edit;
+	CEditorPhrase(QMdiArea *parent) : CEditor(parent) {}
-public:
+	CEditorPhrase() : CEditor() {}
-    CEditorPhrase(QMdiArea* parent) : CEditor(parent) {}
+	void open(QString filename);
-    CEditorPhrase() : CEditor() {}
+	void save();
-    void open(QString filename);
+	void saveAs(QString filename);
-    void save();
+	void activateWindow();
-    void saveAs(QString filename);
-    void activateWindow();
 	void closeEvent(QCloseEvent *event);
+
 public Q_SLOTS:
 	void docContentsChanged();
 	void newUndoCommandAdded();
 
+private:
+	CTextEdit *text_edit;
 };
 
 class CUndoPhraseNewCommand : public QUndoCommand
@@ -79,7 +84,7 @@ public:
 	CUndoPhraseNewCommand(CTextEdit *textEdit, QUndoCommand *parent = 0)
 		: QUndoCommand("Inserting/Removing characters", parent),
 		  m_textEdit(textEdit)
-	{ }
+	{}
 
 	~CUndoPhraseNewCommand() {}
 
@@ -92,8 +97,9 @@ public:
 	{
 		m_textEdit->redo();
 	}
+
 private:
-	CTextEdit* m_textEdit;
+	CTextEdit *m_textEdit;
 };
 
 class SyntaxHighlighter : public QSyntaxHighlighter
@@ -101,87 +107,92 @@ class SyntaxHighlighter : public QSyntaxHighlighter
 public:
 	SyntaxHighlighter(QTextEdit *parent) : QSyntaxHighlighter(parent)
 	{
-     HighlightingRule rule;
+		HighlightingRule rule;
 
-	 translateStringFormat.setFontWeight(QFont::Bold);
+		translateStringFormat.setFontWeight(QFont::Bold);
-	 translateStringFormat.setForeground(Qt::darkMagenta);
+		translateStringFormat.setForeground(Qt::darkMagenta);
-	 rule.pattern = QRegExp("\\[.+\\]");
+		rule.pattern = QRegExp("\\[.+\\]");
-	 rule.format = translateStringFormat;
+		rule.format = translateStringFormat;
-	 highlightingRules.append(rule);
+		highlightingRules.append(rule);
 
+		singleLineCommentFormat.setForeground(Qt::red);
+		rule.pattern = QRegExp("//[^\n]*");
+		rule.format = singleLineCommentFormat;
+		highlightingRules.append(rule);
 
-     singleLineCommentFormat.setForeground(Qt::red);
+		multiLineCommentFormat.setForeground(Qt::red);
-     rule.pattern = QRegExp("//[^\n]*");
-     rule.format = singleLineCommentFormat;
-     highlightingRules.append(rule);
 
-     multiLineCommentFormat.setForeground(Qt::red);
+		quotationFormat.setForeground(Qt::darkGreen);
+		rule.pattern = QRegExp("\".*\"");
+		rule.format = quotationFormat;
+		highlightingRules.append(rule);
 
-     quotationFormat.setForeground(Qt::darkGreen);
+		functionFormat.setFontItalic(true);
-     rule.pattern = QRegExp("\".*\"");
+		functionFormat.setForeground(Qt::blue);
-     rule.format = quotationFormat;
+		rule.pattern = QRegExp("\\(.+\\)");
-     highlightingRules.append(rule);
+		rule.format = functionFormat;
+		highlightingRules.append(rule);
 
-     functionFormat.setFontItalic(true);
+		commentStartExpression = QRegExp("/\\*");
-     functionFormat.setForeground(Qt::blue);
+		commentEndExpression = QRegExp("\\*/");
-     rule.pattern = QRegExp("\\(.+\\)");
-     rule.format = functionFormat;
-     highlightingRules.append(rule);
-
-     commentStartExpression = QRegExp("/\\*");
-     commentEndExpression = QRegExp("\\*/");	
 	}
 
- void highlightBlock(const QString &text)
+	void highlightBlock(const QString &text)
- {
+	{
-     Q_FOREACH(const HighlightingRule &rule, highlightingRules) {
+		Q_FOREACH(const HighlightingRule &rule, highlightingRules)
-         QRegExp expression(rule.pattern);
+		{
-         int index = expression.indexIn(text);
+			QRegExp expression(rule.pattern);
-         while (index >= 0) {
+			int index = expression.indexIn(text);
-             int length = expression.matchedLength();
+			while (index >= 0)
-             setFormat(index, length, rule.format);
+			{
-             index = expression.indexIn(text, index + length);
+				int length = expression.matchedLength();
-         }
+				setFormat(index, length, rule.format);
-     }
+				index = expression.indexIn(text, index + length);
-     setCurrentBlockState(0);
+			}
+		}
+		setCurrentBlockState(0);
 
-     int startIndex = 0;
+		int startIndex = 0;
-     if (previousBlockState() != 1)
+		if (previousBlockState() != 1)
-         startIndex = commentStartExpression.indexIn(text);
+			startIndex = commentStartExpression.indexIn(text);
 
-     while (startIndex >= 0) {
+		while (startIndex >= 0)
-         int endIndex = commentEndExpression.indexIn(text, startIndex);
+		{
-         int commentLength;
+			int endIndex = commentEndExpression.indexIn(text, startIndex);
-         if (endIndex == -1) {
+			int commentLength;
-             setCurrentBlockState(1);
+			if (endIndex == -1)
-             commentLength = text.length() - startIndex;
+			{
-         } else {
+				setCurrentBlockState(1);
-             commentLength = endIndex - startIndex
+				commentLength = text.length() - startIndex;
-                             + commentEndExpression.matchedLength();
+			}
-         }
+			else
-         setFormat(startIndex, commentLength, multiLineCommentFormat);
+			{
-         startIndex = commentStartExpression.indexIn(text, startIndex + commentLength);
+				commentLength = endIndex - startIndex
-     }
+								+ commentEndExpression.matchedLength();
- }
+			}
+			setFormat(startIndex, commentLength, multiLineCommentFormat);
+			startIndex = commentStartExpression.indexIn(text, startIndex + commentLength);
+		}
+	}
 
- private:
+private:
-     struct HighlightingRule
+	struct HighlightingRule
-     {
+	{
-         QRegExp pattern;
+		QRegExp pattern;
-         QTextCharFormat format;
+		QTextCharFormat format;
-     };
+	};
-     QVector<HighlightingRule> highlightingRules;
+	QVector<HighlightingRule> highlightingRules;
 
-     QRegExp commentStartExpression;
+	QRegExp commentStartExpression;
-     QRegExp commentEndExpression;
+	QRegExp commentEndExpression;
 
-     QTextCharFormat keywordFormat;
+	QTextCharFormat keywordFormat;
-     QTextCharFormat classFormat;
+	QTextCharFormat classFormat;
-     QTextCharFormat singleLineCommentFormat;
+	QTextCharFormat singleLineCommentFormat;
-     QTextCharFormat multiLineCommentFormat;
+	QTextCharFormat multiLineCommentFormat;
-     QTextCharFormat quotationFormat;
+	QTextCharFormat quotationFormat;
-     QTextCharFormat functionFormat;
+	QTextCharFormat functionFormat;
-	 QTextCharFormat translateStringFormat;
+	QTextCharFormat translateStringFormat;
 };
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp

@@ -15,6 +15,11 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+// Project includes
+#include "editor_worksheet.h"
+#include "extract_bot_names.h"
+#include "translation_manager_constants.h"
+
 // Qt includes
 #include <QtGui/QErrorMessage>
 #include <QtGui/QTableWidgetItem>
@@ -24,97 +29,103 @@
 #include <QtGui/QAction>
 #include <QtGui/QMenu>
 
-// Project includes
-#include "editor_worksheet.h"
-#include "extract_bot_names.h"
-#include "translation_manager_constants.h"
-#include <set>
-
 using namespace std;
 
-namespace TranslationManager {
+namespace TranslationManager
+{
 
 void CEditorWorksheet::open(QString filename)
 {
-             STRING_MANAGER::TWorksheet wk_file;          
+	STRING_MANAGER::TWorksheet wk_file;
-             if(loadExcelSheet(filename.toStdString(), wk_file, true) == true)
+	if(loadExcelSheet(filename.toStdString(), wk_file, true) == true)
-             {
+	{
-                 bool hasHashValue = false;
+		bool hasHashValue = false;
-                 table_editor = new QTableWidget(); 
+		table_editor = new QTableWidget();
-                 if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
+		if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
-                 {
+		{
-                      table_editor->setColumnCount(wk_file.ColCount - 1);
+			table_editor->setColumnCount(wk_file.ColCount - 1);
-                      hasHashValue = true;
+			hasHashValue = true;
-                 } else {
+		}
-                      table_editor->setColumnCount(wk_file.ColCount);                   
+		else
-                 }
+		{
-                 table_editor->setRowCount(wk_file.size() - 1);
+			table_editor->setColumnCount(wk_file.ColCount);
+		}
+		table_editor->setRowCount(wk_file.size() - 1);
 
-                 // read columns name                
+		// read columns name
-                 for(unsigned int i = 0; i < wk_file.ColCount; i++)
+		for(uint i = 0; i < wk_file.ColCount; i++)
-                 {
+		{
-                     if(hasHashValue && i == 0)
+			if(hasHashValue && i == 0)
-                     {
+			{
-                            // we don't show the column with hash value
+				// we don't show the column with hash value
-                     } else {
+			}
-                        QTableWidgetItem *col = new QTableWidgetItem();
+			else
-                        ucstring col_name = wk_file.getData(0, i);
+			{
-                        col->setText(QString(col_name.toString().c_str()));
+				QTableWidgetItem *col = new QTableWidgetItem();
-                        if(hasHashValue)
+				ucstring col_name = wk_file.getData(0, i);
-                        {
+				col->setText(QString(col_name.toString().c_str()));
-                                table_editor->setHorizontalHeaderItem(i - 1, col);                        
+				if(hasHashValue)
-                        } else {
+				{
-                                table_editor->setHorizontalHeaderItem(i, col);
+					table_editor->setHorizontalHeaderItem(i - 1, col);
-                        }
+				}
-                     }
+				else
-                 }
+				{
-                 
+					table_editor->setHorizontalHeaderItem(i, col);
-                 // read rows
+				}
-                 for(unsigned int i = 1; i < wk_file.size(); i++)
+			}
-                 {
+		}
-                     for(unsigned int j = 0; j < wk_file.ColCount; j++)
-                     {
-                        if(hasHashValue && j == 0)
-                        {
-                            // we don't show the column with hash value
-                        } else {
-                            QTableWidgetItem *row = new QTableWidgetItem();
-                            ucstring row_value = wk_file.getData(i, j);
-							row->setText(QString::fromUtf8(row_value.toUtf8().c_str()));
-                            if(hasHashValue)
-                            {
-                                table_editor->setItem(i - 1, j - 1, row);    
-                            } else {
-                                table_editor->setItem(i - 1, j, row); 
-                            }
-                        }
-                    }
-                }
-                setCurrentFile(filename);
-                setAttribute(Qt::WA_DeleteOnClose);
-                setWidget(table_editor);
-				editor_type = Constants::ED_SHEET;
-                table_editor->resizeColumnsToContents();
-                table_editor->resizeRowsToContents(); 
-                // set editor signals
-                connect(table_editor, SIGNAL(itemChanged(QTableWidgetItem*) ), this, SLOT(worksheetEditorChanged(QTableWidgetItem*)));				
-				connect(table_editor, SIGNAL(itemDoubleClicked(QTableWidgetItem*) ), this, SLOT(worksheetEditorCellEntered(QTableWidgetItem*)));
-				connect (table_editor,SIGNAL(customContextMenuRequested(const QPoint &)), this,SLOT(contextMenuEvent(QContextMenuEvent*)));
-             } else {
-                QErrorMessage error;
-                error.showMessage("This file is not a worksheet file.");
-                error.exec();                             
-             }
 
+		// read rows
+		for(unsigned int i = 1; i < wk_file.size(); i++)
+		{
+			for(unsigned int j = 0; j < wk_file.ColCount; j++)
+			{
+				if(hasHashValue && j == 0)
+				{
+					// we don't show the column with hash value
+				}
+				else
+				{
+					QTableWidgetItem *row = new QTableWidgetItem();
+					ucstring row_value = wk_file.getData(i, j);
+					row->setText(QString::fromUtf8(row_value.toUtf8().c_str()));
+					if(hasHashValue)
+					{
+						table_editor->setItem(i - 1, j - 1, row);
+					}
+					else
+					{
+						table_editor->setItem(i - 1, j, row);
+					}
+				}
+			}
+		}
+		setCurrentFile(filename);
+		setAttribute(Qt::WA_DeleteOnClose);
+		setWidget(table_editor);
+		editor_type = Constants::ED_SHEET;
+		table_editor->resizeColumnsToContents();
+		table_editor->resizeRowsToContents();
+		// set editor signals
+		connect(table_editor, SIGNAL(itemChanged(QTableWidgetItem *) ), this, SLOT(worksheetEditorChanged(QTableWidgetItem *)));
+		connect(table_editor, SIGNAL(itemDoubleClicked(QTableWidgetItem *) ), this, SLOT(worksheetEditorCellEntered(QTableWidgetItem *)));
+		connect(table_editor,SIGNAL(customContextMenuRequested(const QPoint &)), this,SLOT(contextMenuEvent(QContextMenuEvent *)));
+	}
+	else
+	{
+		QErrorMessage error;
+		error.showMessage(tr("This file is not a worksheet file."));
+		error.exec();
+	}
 }
 
 
 void CEditorWorksheet::contextMenuEvent(QContextMenuEvent *e)
 {
-    QAction *insertRowAct = new QAction("Insert new row", this);
+	QAction *insertRowAct = new QAction(tr("Insert new row"), this);
 	connect(insertRowAct, SIGNAL(triggered()), this, SLOT(insertRow()));
-    QAction *deleteRowAct = new QAction("Delete row", this);
+	QAction *deleteRowAct = new QAction(tr("Delete row"), this);
-    connect(deleteRowAct, SIGNAL(triggered()), this, SLOT(deleteRow())); 
+	connect(deleteRowAct, SIGNAL(triggered()), this, SLOT(deleteRow()));
 
 	QMenu *contextMenu = new QMenu(this);
 	contextMenu->addAction(insertRowAct);
@@ -127,7 +138,7 @@ void CEditorWorksheet::contextMenuEvent(QContextMenuEvent *e)
 
 void CEditorWorksheet::activateWindow()
 {
-                showMaximized();                   
+	showMaximized();
 }
 
 void CEditorWorksheet::save()
@@ -137,170 +148,171 @@ void CEditorWorksheet::save()
 
 void CEditorWorksheet::saveAs(QString filename)
 {
-                STRING_MANAGER::TWorksheet new_file, wk_file;  
+	STRING_MANAGER::TWorksheet new_file, wk_file;
-                loadExcelSheet(current_file.toStdString(), wk_file, true);   
+	loadExcelSheet(current_file.toStdString(), wk_file, true);
-                // set columns
+	// set columns
-                new_file.resize(new_file.size() + 1);
+	new_file.resize(new_file.size() + 1);
-                for(unsigned int i = 0; i < wk_file.ColCount; i++)
+	for(unsigned int i = 0; i < wk_file.ColCount; i++)
-                {
+	{
-                    ucstring col_name = wk_file.getData(0, i);
+		ucstring col_name = wk_file.getData(0, i);
-                    new_file.insertColumn(new_file.ColCount);
+		new_file.insertColumn(new_file.ColCount);
-                    new_file.setData(0, new_file.ColCount - 1, col_name);
+		new_file.setData(0, new_file.ColCount - 1, col_name);
-                } 
+	}
-                // read all the rows from table
+	// read all the rows from table
-                uint rowIdx; 
+	uint rowIdx;
-                uint colIdx = 0;
+	uint colIdx = 0;
-                bool hasHashValue = false;
+	bool hasHashValue = false;
-                if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
+	if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
-                {
+	{
-                   hasHashValue = true;
+		hasHashValue = true;
-                   colIdx = 1;
+		colIdx = 1;
-                }
+	}
-                for(int i = 0; i < table_editor->rowCount(); i++)
+	for(int i = 0; i < table_editor->rowCount(); i++)
-                {
+	{
-                     rowIdx = new_file.size();
+		rowIdx = new_file.size();
-                     new_file.resize(new_file.size() + 1);
+		new_file.resize(new_file.size() + 1);
-					 ucstring tvalue;
+		ucstring tvalue;
-                     for(int j = 0; j < table_editor->columnCount(); j++)
+		for(int j = 0; j < table_editor->columnCount(); j++)
-                     {
+		{
-                         QTableWidgetItem* item = table_editor->item(i, j);
+			QTableWidgetItem *item = table_editor->item(i, j);
-						 tvalue.fromUtf8(std::string(item->text().toUtf8()));
+			tvalue.fromUtf8(std::string(item->text().toUtf8()));
-                         new_file.setData(rowIdx, j + colIdx, tvalue);
+			new_file.setData(rowIdx, j + colIdx, tvalue);
-                     }   
+		}
-                 } 
+	}
-                if(hasHashValue)
+	if(hasHashValue)
-                {
+	{
-                        // rewrite the hash codes
+		// rewrite the hash codes
-                        makeHashCode(wk_file, true);
+		makeHashCode(wk_file, true);
-                }
+	}
-                ucstring s = prepareExcelSheet(new_file);            
+	ucstring s = prepareExcelSheet(new_file);
-                NLMISC::CI18N::writeTextFile(filename.toStdString(), s, false); 
+	NLMISC::CI18N::writeTextFile(filename.toStdString(), s, false);
-				current_file = filename;
+	current_file = filename;
-                setCurrentFile(filename);
+	setCurrentFile(filename);
 }
 
 void CEditorWorksheet::insertRow()
 {
-    int last_row = table_editor->rowCount();
+	int last_row = table_editor->rowCount();
 	current_stack->push(new CUndoWorksheetNewCommand(table_editor, last_row));
 }
 
 void CEditorWorksheet::deleteRow()
 {
- int selected_row = table_editor->currentRow();
+	int selected_row = table_editor->currentRow();
- QMessageBox msgBox;
+	QMessageBox msgBox;
- msgBox.setText(tr("The row will be deleted."));
+	msgBox.setIcon(QMessageBox::Question);
- msgBox.setInformativeText(tr("Do you want to delete the selected row ?"));
+	msgBox.setText(tr("The row will be deleted."));
- msgBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
+	msgBox.setInformativeText(tr("Do you want to delete the selected row ?"));
- msgBox.setDefaultButton(QMessageBox::No);
+	msgBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
- int ret = msgBox.exec(); 
+	msgBox.setDefaultButton(QMessageBox::No);
- if(ret == QMessageBox::Yes)
- {
-     current_stack->push(new CUndoWorksheetDeleteCommand(table_editor, selected_row));
- }
 
-  table_editor->clearFocus();
+	int ret = msgBox.exec();
-  table_editor->clearSelection();  
+	if(ret == QMessageBox::Yes)
-  return;
+	{
+		current_stack->push(new CUndoWorksheetDeleteCommand(table_editor, selected_row));
+	}
+	table_editor->clearFocus();
+	table_editor->clearSelection();
+	return;
 }
 
-void CEditorWorksheet::worksheetEditorCellEntered(QTableWidgetItem * item)
+void CEditorWorksheet::worksheetEditorCellEntered(QTableWidgetItem *item)
 {
 	temp_content = item->text();
 	current_stack->push(new CUndoWorksheetCommand(table_editor, item, temp_content));
 }
 
-void CEditorWorksheet::worksheetEditorChanged(QTableWidgetItem * item)
+void CEditorWorksheet::worksheetEditorChanged(QTableWidgetItem *item)
 {
 	if(temp_content != item->text())
 	{
 		//current_stack->push(new CUndoWorksheetCommand(table_editor, item, temp_content));
 	}
 
-    if(!isWindowModified())
+	if(!isWindowModified())
-        setWindowModified(true);
+		setWindowModified(true);
 }
 
 
 void CEditorWorksheet::extractBotNames(list<string> filters, string level_design_path, NLLIGO::CLigoConfig ligoConfig)
 {
-    bool modified = false;
+	bool modified = false;
 	QList<CTableWidgetItemStore> new_items;
 
-    ExtractBotNames ebn;
+	ExtractBotNames ebn;
-    ebn.setRequiredSettings(filters, level_design_path);
+	ebn.setRequiredSettings(filters, level_design_path);
-    ebn.extractBotNamesFromPrimitives(ligoConfig);
+	ebn.extractBotNamesFromPrimitives(ligoConfig);
-                        // get SimpleNames
+	// get SimpleNames
-                    {                       
+	{
-                        map<string, TEntryInfo> SimpleNames =  ebn.getSimpleNames();
+		map<string, TEntryInfo> SimpleNames =  ebn.getSimpleNames();
-                        map<string, TEntryInfo>::iterator it(SimpleNames.begin()), last(SimpleNames.end());
+		map<string, TEntryInfo>::iterator it(SimpleNames.begin()), last(SimpleNames.end());
 
-                        for (; it != last; ++it)
+		for (; it != last; ++it)
-                        {  
+		{
-                            QList<QTableWidgetItem*> search_results = table_editor->findItems(QString(it->first.c_str()), Qt::MatchExactly);
+			QList<QTableWidgetItem *> search_results = table_editor->findItems(QString(it->first.c_str()), Qt::MatchExactly);
-                            if(search_results.size() == 0)
+			if(search_results.size() == 0)
-                            {
+			{
-								QList<QString> records;
+				QList<QString> records;
-								records.push_back(QString(it->first.c_str()));
+				records.push_back(QString(it->first.c_str()));
-								records.push_back(QString(it->first.c_str()));
+				records.push_back(QString(it->first.c_str()));
-								records.push_back(QString(it->second.SheetName.c_str()));  
+				records.push_back(QString(it->second.SheetName.c_str()));
-								insertTableRecords(records, new_items);
+				insertTableRecords(records, new_items);
-                                if(!modified) modified = true;							
+				if(!modified) modified = true;
-                            }
+			}
-                        }  
+		}
-                        ebn.cleanSimpleNames();
+		ebn.cleanSimpleNames();
-                    }
+	}
-                    // get GenericNames
+	// get GenericNames
-                    {
+	{
-                        set<string> GenericNames = ebn.getGenericNames();                       
+		set<string> GenericNames = ebn.getGenericNames();
-                        set<string>::iterator it(GenericNames.begin()), last(GenericNames.end());
+		set<string>::iterator it(GenericNames.begin()), last(GenericNames.end());
-                        for (; it != last; ++it)
+		for (; it != last; ++it)
-                        {
+		{
-                            string gnName = "gn_" + ebn.cleanupName(*it);
+			string gnName = "gn_" + ebn.cleanupName(*it);
-                            QList<QTableWidgetItem*> search_results = table_editor->findItems(QString((*it).c_str()), Qt::MatchExactly);
+			QList<QTableWidgetItem *> search_results = table_editor->findItems(QString((*it).c_str()), Qt::MatchExactly);
-                            if(search_results.size() == 0)
+			if(search_results.size() == 0)
-                            {
+			{
-								QList<QString> records;
+				QList<QString> records;
-								records.push_back(QString((*it).c_str()));
+				records.push_back(QString((*it).c_str()));
-								records.push_back(QString(gnName.c_str()));
+				records.push_back(QString(gnName.c_str()));
-								records.push_back(" ");  
+				records.push_back(" ");
-								insertTableRecords(records, new_items);
+				insertTableRecords(records, new_items);
-                                if(!modified) modified = true;
+				if(!modified) modified = true;
-                            }                         
+			}
-                        }
+		}
-                        ebn.cleanGenericNames();
+		ebn.cleanGenericNames();
-                    } 
+	}
 
-					current_stack->push(new CUndoWorksheetExtraction(new_items, table_editor));
+	current_stack->push(new CUndoWorksheetExtraction(new_items, table_editor));
-                    if(modified)
+	if(modified)
-                    {
+	{
-                        setWindowModified(true);
+		setWindowModified(true);
-						table_editor->scrollToBottom();
+		table_editor->scrollToBottom();
-                    }
+	}
 
 }
 
-void CEditorWorksheet::extractWords(QString filename, QString columnId, IWordListBuilder& wordListBuilder)
+void CEditorWorksheet::extractWords(QString filename, QString columnId, IWordListBuilder &wordListBuilder)
 {
-	uint	i;
+	uint i;
 
 	// **** Load the excel sheet
 	// load
-	TWorksheet		workSheet;
+	STRING_MANAGER::TWorksheet workSheet;
 	if(!loadExcelSheet(filename.toStdString(), workSheet, true))
 	{
 		nlwarning("Error reading '%s'. Aborted", filename.toStdString().c_str());
 		return;
 	}
 	// get the key column index
-	uint	keyColIndex = 0;	
+	uint keyColIndex = 0;
 	if(!workSheet.findCol(columnId.toStdString(), keyColIndex))
 	{
 		nlwarning("Error: Don't find the column '%s'. '%s' Aborted", columnId.toStdString().c_str(), filename.toStdString().c_str());
 		return;
 	}
 	// get the name column index
-	uint	nameColIndex;
+	uint nameColIndex;
 	if(!workSheet.findCol(ucstring("name"), nameColIndex))
 	{
 		nlwarning("Error: Don't find the column 'name'. '%s' Aborted", filename.toStdString().c_str());
@@ -308,42 +320,44 @@ void CEditorWorksheet::extractWords(QString filename, QString columnId, IWordLis
 	}
 
 	// **** List all words with the builder given
-	std::vector<string>		allWords;
+	std::vector<std::string> allWords;
 	if(!wordListBuilder.buildWordList(allWords, filename.toStdString()))
-               {
+	{
 		return;
-                }
+	}
-        bool modified = false;
+	bool modified = false;
-		QList<CTableWidgetItemStore> new_items;
+	QList<CTableWidgetItemStore> new_items;
-        for(i = 0; i < allWords.size(); i++)
+	for(i = 0; i < allWords.size(); i++)
-        {                   
+	{
-                string keyName = allWords[i];
+		string keyName = allWords[i];
-                QList<QTableWidgetItem*> search_results = table_editor->findItems(QString(keyName.c_str()), Qt::MatchExactly);
+		QList<QTableWidgetItem *> search_results = table_editor->findItems(QString(keyName.c_str()), Qt::MatchExactly);
-                if(search_results.size() == 0)
+		if(search_results.size() == 0)
-                {                
+		{
-                        int knPos = 0, nPos = 0;
+			int knPos = 0, nPos = 0;
-                        if(workSheet.getData(0, 0) == ucstring("*HASH_VALUE"))
+			if(workSheet.getData(0, 0) == ucstring("*HASH_VALUE"))
-                        {
+			{
-                            knPos = keyColIndex - 1;
+				knPos = keyColIndex - 1;
-                            nPos = nameColIndex - 1;
+				nPos = nameColIndex - 1;
-                        } else {
+			}
-                            knPos = keyColIndex;
+			else
-                            nPos = nameColIndex;
+			{
-                        }   
+				knPos = keyColIndex;
+				nPos = nameColIndex;
+			}
 
-						QList<QString> records;
+			QList<QString> records;
-						records.push_back(QString(keyName.c_str()));
+			records.push_back(QString(keyName.c_str()));
-						records.push_back(QString("<GEN>") + QString(keyName.c_str())); 
+			records.push_back(QString("<GEN>") + QString(keyName.c_str()));
-						insertTableRecords(records, new_items);
+			insertTableRecords(records, new_items);
-                        if(!modified) modified = true;
+			if(!modified) modified = true;
-                }            
+		}
-        }
+	}
-		current_stack->push(new CUndoWorksheetExtraction(new_items, table_editor));
+	current_stack->push(new CUndoWorksheetExtraction(new_items, table_editor));
-        if(modified)
+	if(modified)
-       {
+	{
-              setWindowModified(true);
+		setWindowModified(true);
-              table_editor->scrollToBottom();
+		table_editor->scrollToBottom();
-       }
+	}
 }
 
 void CEditorWorksheet::insertTableRecords(QList<QString> records, QList<CTableWidgetItemStore> new_items)
@@ -360,149 +374,151 @@ void CEditorWorksheet::insertTableRecords(QList<QString> records, QList<CTableWi
 		new_items.push_back(rec_s);
 		n++;
 	}
-
 }
 
 bool CEditorWorksheet::compareWorksheetFile(QString filename)
 {
-    STRING_MANAGER::TWorksheet wk_file; 
+	STRING_MANAGER::TWorksheet wk_file;
-    int colIndex = 0;
+	int colIndex = 0;
-    if(loadExcelSheet(filename.toStdString(), wk_file, true) == true)
+	if(loadExcelSheet(filename.toStdString(), wk_file, true) == true)
-    {
+	{
-                 if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
+		if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
-                 {
+		{
-                      colIndex = 1;
+			colIndex = 1;
-                 }   
+		}
-                 if(wk_file.ColCount - colIndex != table_editor->columnCount())
+		if(wk_file.ColCount - colIndex != table_editor->columnCount())
-                 {
+		{
-                        return false;
+			return false;
-                 }
+		}
-                 for(int i = 0; i < table_editor->columnCount(); i++)
+		for(int i = 0; i < table_editor->columnCount(); i++)
-                 {
+		{
-                     QString item = table_editor->horizontalHeaderItem(i)->text();
+			QString item = table_editor->horizontalHeaderItem(i)->text();
-                     ucstring itemC = wk_file.getData(0, i+ colIndex);
+			ucstring itemC = wk_file.getData(0, i+ colIndex);
-                     if(item.toStdString() != itemC.toString())
+			if(item.toStdString() != itemC.toString())
-                     {
+			{
-                         nlwarning(item.toStdString().c_str());
+				nlwarning(item.toStdString().c_str());
-                         nlwarning(itemC.toString().c_str());
+				nlwarning(itemC.toString().c_str());
-                         return false;
+				return false;
-                     }
+			}
-                 }               
+		}
-    } else {
+	}
-        return false;
+	else
-    }
+	{
-    
+		return false;
-    return true;
+	}
+	return true;
 }
 
 void CEditorWorksheet::mergeWorksheetFile(QString filename)
 {
-             STRING_MANAGER::TWorksheet wk_file;          
+	STRING_MANAGER::TWorksheet wk_file;
-             if(loadExcelSheet(filename.toStdString(), wk_file, true) == true)
+	if(loadExcelSheet(filename.toStdString(), wk_file, true) == true)
-             {
+	{
-                 bool hasHashValue = false;
+		bool hasHashValue = false;
-                 int colIndex = 0;
+		int colIndex = 0;
-                 if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
+		if(wk_file.getData(0, 0) == ucstring("*HASH_VALUE"))
-                 {
+		{
-                      hasHashValue = true;
+			hasHashValue = true;
-                      colIndex = 1;
+			colIndex = 1;
-                 }           
+		}
-                 // read rows
+		// read rows
-                 for(unsigned int i = 1; i < wk_file.size(); i++)
+		for(unsigned int i = 1; i < wk_file.size(); i++)
-                 {
+		{
-                     // search with the first column
+			// search with the first column
-                     ucstring rowId = wk_file.getData(i,colIndex);
+			ucstring rowId = wk_file.getData(i,colIndex);
-                     QList<QTableWidgetItem*> search_results = table_editor->findItems(QString(rowId.toString().c_str()), Qt::MatchExactly);
+			QList<QTableWidgetItem *> search_results = table_editor->findItems(QString(rowId.toString().c_str()), Qt::MatchExactly);
-                     if(search_results.size() == 0)
+			if(search_results.size() == 0)
-                     {
+			{
-                         const int lastRow = table_editor->rowCount();
+				const int lastRow = table_editor->rowCount();
-                         table_editor->setRowCount(lastRow + 1);
+				table_editor->setRowCount(lastRow + 1);
-                         for(unsigned int j = 0; j < table_editor->columnCount(); j++)
+				for(int j = 0; j < table_editor->columnCount(); j++)
-                         {
+				{
-                             ucstring rowValue = wk_file.getData(i, j + colIndex); // get the value
+					ucstring rowValue = wk_file.getData(i, j + colIndex); // get the value
-                             QTableWidgetItem *row = new QTableWidgetItem();
+					QTableWidgetItem *row = new QTableWidgetItem();
-                             row->setText(QString(rowValue.toString().c_str())); // set the value in table item
+					row->setText(QString(rowValue.toString().c_str())); // set the value in table item
-                             table_editor->setItem(lastRow, j, row);
+					table_editor->setItem(lastRow, j, row);
-                         }
+				}
-                     }
+			}
-                   }
+		}
-                 } else {
+	}
-                        QErrorMessage error;
+	else
-                        error.showMessage(tr("This file is not a worksheet file."));
+	{
-                        error.exec();                             
+		QErrorMessage error;
-                 }
+		error.showMessage(tr("This file is not a worksheet file."));
+		error.exec();
+	}
 }
 
 void CEditorWorksheet::closeEvent(QCloseEvent *event)
 {
-    if(isWindowModified())
+	if(isWindowModified())
-    {
+	{
-        QMessageBox msgBox;
+		QMessageBox msgBox;
-        msgBox.setText(tr("The document has been modified."));
+		msgBox.setIcon(QMessageBox::Question);
-        msgBox.setInformativeText(tr("Do you want to save your changes?"));
+		msgBox.setText(tr("The document has been modified."));
-        msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+		msgBox.setInformativeText(tr("Do you want to save your changes?"));
-        msgBox.setDefaultButton(QMessageBox::Save);
+		msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-        int ret = msgBox.exec();
+		msgBox.setDefaultButton(QMessageBox::Save);
-        switch (ret) 
+		int ret = msgBox.exec();
-        {
+		switch (ret)
-                case QMessageBox::Save:
+		{
-                    save();
+		case QMessageBox::Save:
-                    event->accept();
+			save();
-                    close();
+			break;
-                    break;
+		case QMessageBox::Discard:
-                case QMessageBox::Discard:
+			break;
-                    event->accept();
+		case QMessageBox::Cancel:
-                    close();
+			event->ignore();
-                    break;
+			return;
-                case QMessageBox::Cancel:
+		}
-                    event->ignore();
+	}
-                    break;
+	event->accept();
-                default:
+	close();
-                    break;
-        }
-    } else {
-        event->accept();
-        close();
-    }
 }
 
 
 bool CEditorWorksheet::isBotNamesTable()
 {
-    bool status = true;
+	bool status = true;
-   if(table_editor->horizontalHeaderItem(0)->text() != "bot name" 
+	if(table_editor->horizontalHeaderItem(0)->text() != "bot name"
-           || table_editor->horizontalHeaderItem(1)->text() != "translated name" 
+			|| table_editor->horizontalHeaderItem(1)->text() != "translated name"
-           || table_editor->horizontalHeaderItem(2)->text() != "sheet_name")
+			|| table_editor->horizontalHeaderItem(2)->text() != "sheet_name")
-   {
+	{
-       status = false;
+		status = false;
-   }
+	}
-                 
+	return status;
-    return status;
 }
 
 bool CEditorWorksheet::isSheetTable(QString type)
 {
-    QString column_name;
+	QString column_name;
-    if(type.toAscii() == Constants::WK_ITEM)
+	if(type.toAscii() == Constants::WK_ITEM)
-    {
+	{
-        column_name = "item ID";    
+		column_name = "item ID";
-    } else if(type.toAscii() == Constants::WK_CREATURE) {
+	}
-        column_name = "creature ID";   
+	else if(type.toAscii() == Constants::WK_CREATURE)
-    } else if(type.toAscii() == Constants::WK_SBRICK) {
+	{
-        column_name = "sbrick ID";       
+		column_name = "creature ID";
-    } else if(type.toAscii() == Constants::WK_SPHRASE) {
+	}
-        column_name = "sphrase ID";   
+	else if(type.toAscii() == Constants::WK_SBRICK)
-    } else if(type.toAscii() == Constants::WK_PLACE) {
+	{
-        column_name = "placeId";
+		column_name = "sbrick ID";
-    }
+	}
-   bool status = true;
+	else if(type.toAscii() == Constants::WK_SPHRASE)
-   if(table_editor->horizontalHeaderItem(0)->text() != column_name
+	{
-           || table_editor->horizontalHeaderItem(1)->text() != "name")
+		column_name = "sphrase ID";
-   {
+	}
-       status = false;
+	else if(type.toAscii() == Constants::WK_PLACE)
-   }
+	{
-                 
+		column_name = "placeId";
-   return status;    
+	}
+	bool status = true;
+	if(table_editor->horizontalHeaderItem(0)->text() != column_name
+			|| table_editor->horizontalHeaderItem(1)->text() != "name")
+	{
+		status = false;
+	}
+	return status;
 }
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h

@@ -18,6 +18,10 @@
 #ifndef EDITOR_WORKSHEET_H
 #define EDITOR_WORKSHEET_H
 
+// Project includes
+#include "translation_manager_editor.h"
+#include "extract_new_sheet_names.h"
+
 // Nel includes
 #include "nel/misc/types_nl.h"
 #include "nel/misc/sheet_id.h"
@@ -34,11 +38,9 @@
 #include <QtGui/QUndoCommand>
 #include <QtGui/QUndoStack>
 
-// Project includes
-#include "translation_manager_editor.h"
-#include "extract_new_sheet_names.h"
 
-namespace TranslationManager {
+namespace TranslationManager
+{
 
 struct CTableWidgetItemStore
 {
@@ -47,6 +49,7 @@ public:
 		m_item(item),
 		m_row(row),
 		m_column(column) { }
+
 	QTableWidgetItem *m_item;
 	int m_row;
 	int m_column;
@@ -54,38 +57,40 @@ public:
 
 class CEditorWorksheet : public CEditor
 {
-    Q_OBJECT
+	Q_OBJECT
-private:   
+
-	QString temp_content;
 public:
-    CEditorWorksheet(QMdiArea* parent) : CEditor(parent) {}
+	CEditorWorksheet(QMdiArea *parent) : CEditor(parent) {}
-    CEditorWorksheet() : CEditor() {}
+	CEditorWorksheet() : CEditor() {}
-	QTableWidget* table_editor;
+	QTableWidget *table_editor;
-    void open(QString filename);
+	void open(QString filename);
-    void save();
+	void save();
-    void saveAs(QString filename);
+	void saveAs(QString filename);
-    void activateWindow();
+	void activateWindow();
-    void mergeWorksheetFile(QString filename);
+	void mergeWorksheetFile(QString filename);
-    bool compareWorksheetFile(QString filename);
+	bool compareWorksheetFile(QString filename);
-    void extractBotNames(list<string> filters, string level_design_path, NLLIGO::CLigoConfig ligoConfig);
+	void extractBotNames(std::list<std::string> filters, std::string level_design_path, NLLIGO::CLigoConfig ligoConfig);
-    void extractWords(QString filename, QString columnId, IWordListBuilder &wordListBuilder);
+	void extractWords(QString filename, QString columnId, IWordListBuilder &wordListBuilder);
 	void insertTableRecords(QList<QString> records, QList<CTableWidgetItemStore> new_items);
-    bool isBotNamesTable();
+	bool isBotNamesTable();
-    bool isSheetTable(QString type);
+	bool isSheetTable(QString type);
-    void closeEvent(QCloseEvent *event);
+	void closeEvent(QCloseEvent *event);
+
 private Q_SLOTS:
-	void worksheetEditorCellEntered(QTableWidgetItem * item);
+	void worksheetEditorCellEntered(QTableWidgetItem *item);
-    void worksheetEditorChanged(QTableWidgetItem * item);
+	void worksheetEditorChanged(QTableWidgetItem *item);
-    void insertRow();
+	void insertRow();
-    void deleteRow();
+	void deleteRow();
 	void contextMenuEvent(QContextMenuEvent *e);
 
+private:
+	QString temp_content;
 };
 
 class CUndoWorksheetCommand : public QUndoCommand
 {
 public:
-	CUndoWorksheetCommand(QTableWidget *table, QTableWidgetItem* item, const QString &ocontent, QUndoCommand *parent = 0) :  QUndoCommand("Insert characters in cells", parent), m_table(table), m_item(item),  m_ocontent(ocontent) 
+	CUndoWorksheetCommand(QTableWidget *table, QTableWidgetItem *item, const QString &ocontent, QUndoCommand *parent = 0) :  QUndoCommand("Insert characters in cells", parent), m_table(table), m_item(item),  m_ocontent(ocontent)
 	{
 		m_ccontent = m_ocontent;
 	}
@@ -106,8 +111,8 @@ public:
 		m_item->setText(m_ocontent);
 	}
 private:
-	QTableWidget* m_table;
+	QTableWidget *m_table;
-	QTableWidgetItem* m_item;
+	QTableWidgetItem *m_item;
 	QString m_ocontent;
 	QString m_ccontent;
 };
@@ -123,7 +128,7 @@ public:
 		m_table->setRowCount(m_rowID + 1);
 		for(int j = 0; j < m_table->columnCount(); j++)
 		{
-			QTableWidgetItem* item = new QTableWidgetItem();
+			QTableWidgetItem *item = new QTableWidgetItem();
 			m_table->setItem(m_rowID, j, item);
 			m_table->scrollToBottom();
 		}
@@ -133,10 +138,10 @@ public:
 	{
 		m_table->removeRow(m_rowID);
 	}
-private:
-	QTableWidget* m_table;
-	int m_rowID;
 
+private:
+	QTableWidget *m_table;
+	int m_rowID;
 };
 
 class CUndoWorksheetExtraction : public QUndoCommand
@@ -153,7 +158,6 @@ public:
 		{
 			m_table->setItem(is.m_row, is.m_column, is.m_item);
 		}
-
 	}
 
 	void undo()
@@ -163,12 +167,11 @@ public:
 			m_table->setItem(is.m_row, is.m_column, is.m_item);
 			m_table->takeItem(is.m_row, is.m_column);
 		}
-		
 	}
 
 private:
 	QList<CTableWidgetItemStore> m_items;
-	QTableWidget* m_table;
+	QTableWidget *m_table;
 };
 
 class CUndoWorksheetDeleteCommand : public QUndoCommand
@@ -181,8 +184,8 @@ public:
 	{
 		for(int i = 0; i < m_table->columnCount(); i++)
 		{
-			QTableWidgetItem* item = new QTableWidgetItem();
+			QTableWidgetItem *item = new QTableWidgetItem();
-			QTableWidgetItem* table_item = m_table->item(m_rowID, i);
+			QTableWidgetItem *table_item = m_table->item(m_rowID, i);
 			item->setText(table_item->text());
 			m_deletedItems.push_back(item);
 		}
@@ -203,8 +206,8 @@ public:
 	}
 
 private:
-	QList<QTableWidgetItem*> m_deletedItems;
+	QList<QTableWidgetItem *> m_deletedItems;
-	QTableWidget* m_table;
+	QTableWidget *m_table;
 	int m_rowID;
 };
 

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_bot_names.cpp

@@ -17,18 +17,14 @@
 
 #include "extract_bot_names.h"
 
-
 static bool	RemoveOlds = false;
 
-
-
-
 namespace TranslationManager
 {
 
 TCreatureInfo *ExtractBotNames::getCreature(const std::string &sheetName)
 {
-	CSheetId id(sheetName+".creature");
+	NLMISC::CSheetId id(sheetName+".creature");
 
 	if (Creatures.find(id) != Creatures.end())
 		return &(Creatures.find(id)->second);
@@ -36,18 +32,17 @@ TCreatureInfo *ExtractBotNames::getCreature(const std::string &sheetName)
 		return NULL;
 }
 
-string ExtractBotNames::cleanupName(const std::string &name)
+std::string ExtractBotNames::cleanupName(const std::string &name)
 {
-	string ret;
+	std::string ret;
 
-	for (uint i=0; i<name.size(); ++i)
+	for (size_t i = 0; i < name.size(); ++i)
 	{
 		if (name[i] != ' ')
 			ret += name[i];
 		else
 			ret += '_';
 	}
-
 	return ret;
 }
 
@@ -55,14 +50,13 @@ ucstring ExtractBotNames::cleanupUcName(const ucstring &name)
 {
 	ucstring ret;
 
-	for (uint i=0; i<name.size(); ++i)
+	for (size_t i = 0; i < name.size(); ++i)
 	{
 		if (name[i] != ' ')
 			ret += name[i];
 		else
 			ret += '_';
 	}
-
 	return ret;
 }
 
@@ -70,76 +64,72 @@ ucstring ExtractBotNames::cleanupUcName(const ucstring &name)
 /*
 	Removes first and last '$'
 */
-ucstring ExtractBotNames::makeGroupName(const ucstring & translationName)
+ucstring ExtractBotNames::makeGroupName(const ucstring &translationName)
 {
 	ucstring ret = translationName;
 	if (ret.size() >= 2)
 	{
-		if ( *ret.begin() == ucchar('$'))
+		if (*ret.begin() == ucchar('$'))
 		{
 			ret=ret.substr(1);
 		}
-		if ( *ret.rbegin() == ucchar('$'))
+		if (*ret.rbegin() == ucchar('$'))
 		{
-			ret = ret.substr(0, ret.size()-1);
+			ret = ret.substr(0, ret.size() - 1);
 		}
 	}
 	ret = cleanupUcName(ret);
 	return ret;
 }
 
-
+std::set<std::string> ExtractBotNames::getGenericNames()
-
-
-
-set<string> ExtractBotNames::getGenericNames()
 {
-    return GenericNames;
+	return GenericNames;
 }
 
-map<string, TEntryInfo> ExtractBotNames::getSimpleNames()
+std::map<std::string, TEntryInfo> ExtractBotNames::getSimpleNames()
 {
-    return SimpleNames;
+	return SimpleNames;
 }
 
 void ExtractBotNames::cleanSimpleNames()
 {
-    SimpleNames.clear();
+	SimpleNames.clear();
 }
 
 void ExtractBotNames::cleanGenericNames()
 {
-    GenericNames.clear();
+	GenericNames.clear();
 }
 
-string	ExtractBotNames::removeAndStoreFunction(const std::string &fullName)
+std::string ExtractBotNames::removeAndStoreFunction(const std::string &fullName)
 {
-	string::size_type pos = fullName.find("$");
+	std::string::size_type pos = fullName.find("$");
-	if (pos == string::npos)
+	if (pos == std::string::npos)
+	{
 		return fullName;
+	}
 	else
 	{
 		// extract and store the function name
-		string ret;
+		std::string ret;
 
 		ret = fullName.substr(0, pos);
-		string::size_type pos2 = fullName.find("$", pos+1);
+		std::string::size_type pos2 = fullName.find("$", pos+1);
 
-		string fct = fullName.substr(pos+1, pos2-(pos+1));
+		std::string fct = fullName.substr(pos + 1, pos2 - (pos + 1));
 
-		ret += fullName.substr(pos2+1);
+		ret += fullName.substr(pos2 + 1);
 
 		if (Functions.find(fct) == Functions.end())
 		{
 			nldebug("Adding function '%s'", fct.c_str());
 			Functions.insert(fct);
 		}
-
 		return ret;
 	}
 }
 
-
 void ExtractBotNames::addGenericName(const std::string &name, const std::string &sheetName)
 {
 	TCreatureInfo *c = getCreature(sheetName);
@@ -185,75 +175,72 @@ void ExtractBotNames::addSimpleName(const std::string &name, const std::string &
 	}
 }
 
-void ExtractBotNames::setRequiredSettings(list<string> filters, string level_design_path)
+void ExtractBotNames::setRequiredSettings(std::list<std::string> filters, std::string level_design_path)
 {
-	for (std::list<string>::iterator it = filters.begin(); it != filters.end(); ++it)
+	for (std::list<std::string>::iterator it = filters.begin(); it != filters.end(); ++it)
 	{
 		Filters.push_back(*it);
 	}
 
 	//-------------------------------------------------------------------
 	// init the sheets
-	CSheetId::init(false);
+	NLMISC::CSheetId::init(false);
-	const string PACKED_SHEETS_NAME = "bin/translation_tools_creature.packed_sheets";
+	const std::string PACKED_SHEETS_NAME = "bin/translation_tools_creature.packed_sheets";
 	loadForm("creature", PACKED_SHEETS_NAME, Creatures, false, false);
 
 	if (Creatures.empty())
 	{
-                loadForm("creature", PACKED_SHEETS_NAME, Creatures, true);
+		loadForm("creature", PACKED_SHEETS_NAME, Creatures, true);
 	}
-  
 }
 
-void ExtractBotNames::extractBotNamesFromPrimitives(CLigoConfig ligoConfig)
+void ExtractBotNames::extractBotNamesFromPrimitives(NLLIGO::CLigoConfig ligoConfig)
 {
-
 	//-------------------------------------------------------------------
 	// ok, ready for the real work,
 	// first, read the primitives files and parse the primitives
-	vector<string>	files;
+	std::vector<std::string>	files;
-	CPath::getFileList("primitive", files);
+	NLMISC::CPath::getFileList("primitive", files);
-
 
 	for (uint i=0; i<files.size(); ++i)
 	{
-		string pathName = files[i];
+		std::string pathName = files[i];
-		pathName = CPath::lookup(pathName);
+		pathName = NLMISC::CPath::lookup(pathName);
 
+		/*
+				// dnk-88: what is it?
+				// check filters
+				uint j = 0;
+				for (size_t j = 0; j < Filters.size(); ++j)
+				{
+					if (pathName.find(Filters[j]) != std::string::npos)
+						break;
+				}
+				if (j != Filters.size())
+					// skip this file
+					continue;
+		*/
+		nlinfo("Loading file '%s'...", NLMISC::CFile::getFilename(pathName).c_str());
 
-                
+		NLLIGO::CPrimitives primDoc;
-		// check filters
+		NLLIGO::CPrimitiveContext::instance().CurrentPrimitive = &primDoc;
-		uint j=0;
-		for (j=0; j<Filters.size(); ++j)
-		{
-			if (pathName.find(Filters[j]) != string::npos)
-				break;
-		}
-		if (j != Filters.size())
-			// skip this file
-			continue;
-
-		nlinfo("Loading file '%s'...", CFile::getFilename(pathName).c_str());
-		
-		CPrimitives primDoc;
-		CPrimitiveContext::instance().CurrentPrimitive = &primDoc;
 		loadXmlPrimitiveFile(primDoc, pathName, ligoConfig);
 
 		// now parse the file
 
 		// look for group template
 		{
-			TPrimitiveClassPredicate pred("group_template_npc");
+			NLLIGO::TPrimitiveClassPredicate pred("group_template_npc");
-			TPrimitiveSet result;
+			NLLIGO::TPrimitiveSet result;
 
-			CPrimitiveSet<TPrimitiveClassPredicate> ps;
+			NLLIGO::CPrimitiveSet<NLLIGO::TPrimitiveClassPredicate> ps;
 			ps.buildSet(primDoc.RootNode, pred, result);
 
-			for (uint i=0; i<result.size(); ++i)
+			for (uint i = 0; i < result.size(); ++i)
 			{
-				string name;
+				std::string name;
-				string countStr;
+				std::string countStr;
-				string sheetStr;
+				std::string sheetStr;
 				result[i]->getPropertyByName("name", name);
 				result[i]->getPropertyByName("count", countStr);
 				result[i]->getPropertyByName("bot_sheet_look", sheetStr);
@@ -276,16 +263,16 @@ void ExtractBotNames::extractBotNamesFromPrimitives(CLigoConfig ligoConfig)
 		}
 		// look for bot template
 		{
-			TPrimitiveClassPredicate pred("bot_template_npc");
+			NLLIGO::TPrimitiveClassPredicate pred("bot_template_npc");
-			TPrimitiveSet result;
+			NLLIGO::TPrimitiveSet result;
 
-			CPrimitiveSet<TPrimitiveClassPredicate> ps;
+			NLLIGO::CPrimitiveSet<NLLIGO::TPrimitiveClassPredicate> ps;
 			ps.buildSet(primDoc.RootNode, pred, result);
 
-			for (uint i=0; i<result.size(); ++i)
+			for (size_t i = 0; i < result.size(); ++i)
 			{
-				string name;
+				std::string name;
-				string sheetStr;
+				std::string sheetStr;
 				result[i]->getPropertyByName("name", name);
 				result[i]->getPropertyByName("sheet_look", sheetStr);
 
@@ -307,17 +294,17 @@ void ExtractBotNames::extractBotNamesFromPrimitives(CLigoConfig ligoConfig)
 		}
 		// look for npc_group
 		{
-			TPrimitiveClassPredicate pred("npc_group");
+			NLLIGO::TPrimitiveClassPredicate pred("npc_group");
-			TPrimitiveSet result;
+			NLLIGO::TPrimitiveSet result;
 
-			CPrimitiveSet<TPrimitiveClassPredicate> ps;
+			NLLIGO::CPrimitiveSet<NLLIGO::TPrimitiveClassPredicate> ps;
 			ps.buildSet(primDoc.RootNode, pred, result);
 
-			for (uint i=0; i<result.size(); ++i)
+			for (size_t i = 0; i < result.size(); ++i)
 			{
-				string name;
+				std::string name;
-				string countStr;
+				std::string countStr;
-				string sheetStr;
+				std::string sheetStr;
 				result[i]->getPropertyByName("name", name);
 				result[i]->getPropertyByName("count", countStr);
 				result[i]->getPropertyByName("bot_sheet_client", sheetStr);
@@ -344,16 +331,16 @@ void ExtractBotNames::extractBotNamesFromPrimitives(CLigoConfig ligoConfig)
 		}
 		// look for bot
 		{
-			TPrimitiveClassPredicate pred("npc_bot");
+			NLLIGO::TPrimitiveClassPredicate pred("npc_bot");
-			TPrimitiveSet result;
+			NLLIGO::TPrimitiveSet result;
 
-			CPrimitiveSet<TPrimitiveClassPredicate> ps;
+			NLLIGO::CPrimitiveSet<NLLIGO::TPrimitiveClassPredicate> ps;
 			ps.buildSet(primDoc.RootNode, pred, result);
 
-			for (uint i=0; i<result.size(); ++i)
+			for (size_t i = 0; i < result.size(); ++i)
 			{
-				string name;
+				std::string name;
-				string sheetStr;
+				std::string sheetStr;
 				result[i]->getPropertyByName("name", name);
 				result[i]->getPropertyByName("sheet_client", sheetStr);
 

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_bot_names.h

@@ -30,22 +30,16 @@
 #include "nel/ligo/primitive.h"
 #include "nel/ligo/primitive_utils.h"
 
-using namespace std;
-using namespace NLMISC;
-using namespace NLLIGO;
-using namespace STRING_MANAGER;
-
 namespace TranslationManager
 {
 
 struct TCreatureInfo
 {
-	CSheetId	SheetId;
+	NLMISC::CSheetId SheetId;
-	bool		ForceSheetName;
+	bool ForceSheetName;
-	bool		DisplayName;
+	bool DisplayName;
 
-
+	void readGeorges(const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId)
-	void	readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId)
 	{
 		const NLGEORGES::UFormElm &item=form->getRootNode();
 
@@ -61,7 +55,6 @@ struct TCreatureInfo
 		f.serial(DisplayName);
 	}
 
-
 	static uint getVersion ()
 	{
 		return 1;
@@ -70,42 +63,37 @@ struct TCreatureInfo
 	void removed()
 	{
 	}
-	
 };
 
 struct TEntryInfo
 {
-	string	SheetName;
+	std::string SheetName;
 };
 
 struct ExtractBotNames
 {
 private:
-    vector<string>	Filters;
+	std::vector<std::string> Filters;
-    std::map<CSheetId, TCreatureInfo>	Creatures;
+	std::map<NLMISC::CSheetId, TCreatureInfo> Creatures;
-    set<string>					GenericNames;
+	std::set<std::string> GenericNames;
-    map<string, TEntryInfo>		SimpleNames;
+	std::map<std::string, TEntryInfo> SimpleNames;
-    set<string>					Functions;
+	std::set<std::string> Functions;
 private:
-    TCreatureInfo *getCreature(const std::string &sheetName);
+	TCreatureInfo *getCreature(const std::string &sheetName);
-    ucstring makeGroupName(const ucstring & translationName);
+	ucstring makeGroupName(const ucstring &translationName);
-    string	removeAndStoreFunction(const std::string &fullName);
+	std::string removeAndStoreFunction(const std::string &fullName);
-    void addGenericName(const std::string &name, const std::string &sheetName);
+	void addGenericName(const std::string &name, const std::string &sheetName);
-    void addSimpleName(const std::string &name, const std::string &sheetName);
+	void addSimpleName(const std::string &name, const std::string &sheetName);
 public:
-    void extractBotNamesFromPrimitives(CLigoConfig ligoConfig);
+	void extractBotNamesFromPrimitives(NLLIGO::CLigoConfig ligoConfig);
-    void setRequiredSettings(list<string> filters, string level_design_path);
+	void setRequiredSettings(std::list<std::string> filters, std::string level_design_path);
-    set<string> getGenericNames();
+	std::set<std::string> getGenericNames();
-    map<string, TEntryInfo> getSimpleNames();
+	std::map<std::string, TEntryInfo> getSimpleNames();
-    string cleanupName(const std::string &name);
+	std::string cleanupName(const std::string &name);
-    ucstring cleanupUcName(const ucstring &name);
+	ucstring cleanupUcName(const ucstring &name);
-    void cleanSimpleNames();
+	void cleanSimpleNames();
-    void cleanGenericNames();
+	void cleanGenericNames();
-    
 };
-
 }
 
-
 #endif	/* EXTRACT_BOT_NAMES_H */
-

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp

@@ -16,139 +16,135 @@
 
 #include "extract_new_sheet_names.h"
 
-using namespace std;
-using namespace NLMISC;
-using namespace NLLIGO;
-using namespace STRING_MANAGER;
-
 namespace TranslationManager
 {
 
-
-
 // ***************************************************************************
 /*
  *	Specialisation of IWordListBuilder to list sheets in a directory
  */
 
-
+bool CSheetWordListBuilder::buildWordList(std::vector<std::string> &allWords, std::string workSheetFileName)
-bool	CSheetWordListBuilder::buildWordList(std::vector<string> &allWords, string workSheetFileName)
+{
+	SheetExt = NLMISC::toLower(SheetExt);
+	// verify the directory is correct
+	if(!NLMISC::CFile::isDirectory(SheetPath))
 	{
-		SheetExt= toLower(SheetExt);
+		nlwarning("Error: Directory '%s' not found. '%s' Aborted", SheetPath.c_str(), workSheetFileName.c_str());
-		// verify the directory is correct
+		return false;
-		if(!CFile::isDirectory(SheetPath))
-		{
-			nlwarning("Error: Directory '%s' not found. '%s' Aborted", SheetPath.c_str(), workSheetFileName.c_str());
-			return false;
-		}
-		
-		// list all files.
-		std::vector<string>		allFiles;
-		allFiles.reserve(100000);
-		CPath::getPathContent(SheetPath, true, false, true, allFiles, NULL);
-		
-		// Keep only the extension we want, and remove "_" (parent)
-		allWords.clear();
-		allWords.reserve(allFiles.size());
-		for(uint i=0;i<allFiles.size();i++)
-		{
-			string	fileNameWithoutExt= CFile::getFilenameWithoutExtension(allFiles[i]);
-			string	extension= toLower(CFile::getExtension(allFiles[i]));
-			// bad extension?
-			if(extension!=SheetExt)
-				continue;
-			// parent?
-			if(fileNameWithoutExt.empty()||fileNameWithoutExt[0]=='_')
-				continue;
-			// ok, add
-			allWords.push_back(toLower(fileNameWithoutExt));
-		}
-
-		return true;
 	}
 
+	// list all files.
+	std::vector<std::string> allFiles;
+	allFiles.reserve(100000);
+	NLMISC::CPath::getPathContent(SheetPath, true, false, true, allFiles, NULL);
 
+	// Keep only the extension we want, and remove "_" (parent)
+	allWords.clear();
+	allWords.reserve(allFiles.size());
+	for(size_t i = 0; i < allFiles.size(); i++)
+	{
+		std::string fileNameWithoutExt = NLMISC::CFile::getFilenameWithoutExtension(allFiles[i]);
+		std::string extension = NLMISC::toLower(NLMISC::CFile::getExtension(allFiles[i]));
+
+		// bad extension?
+		if(extension!=SheetExt)
+			continue;
+
+		// parent?
+		if(fileNameWithoutExt.empty() || fileNameWithoutExt[0] == '_')
+			continue;
+
+		// ok, add
+		allWords.push_back(NLMISC::toLower(fileNameWithoutExt));
+	}
+	return true;
+}
 
 // ***************************************************************************
 /*
  *	Specialisation of IWordListBuilder to list new region/place name from .primitive
  */
-bool	CRegionPrimWordListBuilder::buildWordList(std::vector<string> &allWords, string workSheetFileName)
+bool CRegionPrimWordListBuilder::buildWordList(std::vector<std::string> &allWords, std::string workSheetFileName)
+{
+	// verify the directory is correct
+	if(!NLMISC::CFile::isDirectory(PrimPath))
 	{
-		// verify the directory is correct
+		nlwarning("Error: Directory '%s' not found. '%s' Aborted", PrimPath.c_str(), workSheetFileName.c_str());
-		if(!CFile::isDirectory(PrimPath))
+		return false;
+	}
+
+	// list all files.
+	std::vector<std::string> allFiles;
+	allFiles.reserve(100000);
+	NLMISC::CPath::getPathContent(PrimPath, true, false, true, allFiles, NULL);
+
+	// parse all primitive that match the filter
+	allWords.clear();
+	allWords.reserve(100000);
+	// to avoid duplicate
+	std::set<std::string> allWordSet;
+	for(size_t i = 0; i < allFiles.size(); i++)
+	{
+		std::string fileName = NLMISC::CFile::getFilename(allFiles[i]);
+		// filter don't match?
+		bool oneMatch= false;
+		for(size_t filter = 0; filter < PrimFilter.size(); filter++)
 		{
-			nlwarning("Error: Directory '%s' not found. '%s' Aborted", PrimPath.c_str(), workSheetFileName.c_str());
+			if(NLMISC::testWildCard(fileName, PrimFilter[filter]))
+				oneMatch= true;
+		}
+		if(!oneMatch)
+			continue;
+
+		// ok, read the file
+		NLLIGO::CPrimitives PrimDoc;
+		NLLIGO::CPrimitiveContext::instance().CurrentPrimitive = &PrimDoc;
+		if (!NLLIGO::loadXmlPrimitiveFile(PrimDoc, allFiles[i], LigoConfig))
+		{
+			nlwarning("Error: cannot open file '%s'. '%s' Aborted", allFiles[i].c_str(), workSheetFileName.c_str());
+			NLLIGO::CPrimitiveContext::instance().CurrentPrimitive = NULL;
 			return false;
 		}
+		NLLIGO::CPrimitiveContext::instance().CurrentPrimitive = NULL;
 
-		// list all files.
+		// For all primitives of interest
-		std::vector<string>		allFiles;
+		const char *listClass[] = {"continent", "region", "place", "stable",
-		allFiles.reserve(100000);
+								   "teleport_destination", "room_template"
-		CPath::getPathContent(PrimPath, true, false, true, allFiles, NULL);
+								  };
 
-		// parse all primitive that match the filter
+		const char *listProp[] = {"name", "name", "name", "name",
-		allWords.clear();
+								  "place_name", "place_name"
-		allWords.reserve(100000);
+								 };
-		// to avoid duplicate
+
-		set<string>		allWordSet;
+		const uint numListClass= sizeof(listClass)/sizeof(listClass[0]);
-		for(uint i=0;i<allFiles.size();i++)
+		const uint numListProp= sizeof(listProp)/sizeof(listProp[0]);
+		nlctassert(numListProp == numListClass);
+		for(uint cid = 0; cid < numListClass; cid++)
 		{
-			string	fileName= CFile::getFilename(allFiles[i]);
+			// parse the whole hierarchy
-			// filter don't match?
+			NLLIGO::TPrimitiveClassPredicate predCont(listClass[cid]);
-			bool	oneMatch= false;
+			NLLIGO::CPrimitiveSet<NLLIGO::TPrimitiveClassPredicate> setPlace;
-			for(uint filter=0;filter<PrimFilter.size();filter++)
+			NLLIGO::TPrimitiveSet placeRes;
-			{
+			setPlace.buildSet(PrimDoc.RootNode, predCont, placeRes);
-				if(testWildCard(fileName, PrimFilter[filter]))
-					oneMatch= true;
-			}
-			if(!oneMatch)
-				continue;
 
-			// ok, read the file
+			// for all found
-			CPrimitives PrimDoc;
+			for (size_t placeId = 0; placeId < placeRes.size(); ++placeId)
-			CPrimitiveContext::instance().CurrentPrimitive = &PrimDoc;
-			if (!loadXmlPrimitiveFile(PrimDoc, allFiles[i], LigoConfig))
 			{
-				nlwarning("Error: cannot open file '%s'. '%s' Aborted", allFiles[i].c_str(), workSheetFileName.c_str());
+				std::string primName;
-				CPrimitiveContext::instance().CurrentPrimitive = NULL;
+				if(placeRes[placeId]->getPropertyByName(listProp[cid], primName) && !primName.empty())
-				return false;
-			}
-			CPrimitiveContext::instance().CurrentPrimitive = NULL;
-			
-			// For all primitives of interest
-			const char	*listClass[]= {"continent", "region", "place", "stable", 
-				"teleport_destination", "room_template"};
-			const char	*listProp[]= {"name", "name", "name", "name", 
-				"place_name", "place_name"};
-			const uint	numListClass= sizeof(listClass)/sizeof(listClass[0]);
-			const uint	numListProp= sizeof(listProp)/sizeof(listProp[0]);
-			nlctassert(numListProp==numListClass);
-			for(uint cid=0;cid<numListClass;cid++)
-			{
-				// parse the whole hierarchy
-				TPrimitiveClassPredicate predCont(listClass[cid]);
-				CPrimitiveSet<TPrimitiveClassPredicate> setPlace;
-				TPrimitiveSet placeRes;
-				setPlace.buildSet(PrimDoc.RootNode, predCont, placeRes);
-				// for all found
-				for (uint placeId= 0; placeId < placeRes.size(); ++placeId)
 				{
-					string primName;
+					primName = NLMISC::toLower(primName);
-					if(placeRes[placeId]->getPropertyByName(listProp[cid], primName) && !primName.empty())
+					// avoid duplicate
+					if(allWordSet.insert(primName).second)
 					{
-						primName= toLower(primName);
+						allWords.push_back(primName);
-						// avoid duplicate
-						if(allWordSet.insert(primName).second)
-						{
-							allWords.push_back(primName);
-						}
 					}
 				}
 			}
 		}
-		
-		return true;
 	}
+	return true;
+}
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.h

@@ -30,43 +30,34 @@
 #include "nel/ligo/primitive.h"
 #include "nel/ligo/primitive_utils.h"
 
-using namespace std;
-using namespace NLMISC;
-using namespace NLLIGO;
-using namespace STRING_MANAGER;
-
 namespace TranslationManager
 {
 
-
 // ***************************************************************************
 /*
  *	Interface to build the whole list of words (key id) for a specific worksheet
  */
 struct IWordListBuilder
 {
-	virtual bool	buildWordList(std::vector<string> &allWords, string workSheetFileName) =0;
+	virtual bool buildWordList(std::vector<std::string> &allWords, std::string workSheetFileName) =0;
-        
 };
 
 struct CSheetWordListBuilder : public IWordListBuilder
 {
-	string		SheetExt;
+	std::string SheetExt;
-	string		SheetPath;
+	std::string SheetPath;
 
-      virtual bool	buildWordList(std::vector<string> &allWords, string workSheetFileName);
+	virtual bool buildWordList(std::vector<std::string> &allWords, std::string workSheetFileName);
 };
 
 struct CRegionPrimWordListBuilder : public IWordListBuilder
 {
-	string			PrimPath;
+	std::string PrimPath;
-	vector<string>	PrimFilter;
+	std::vector<std::string> PrimFilter;
-               NLLIGO::CLigoConfig LigoConfig;
+	NLLIGO::CLigoConfig LigoConfig;
-        virtual bool	buildWordList(std::vector<string> &allWords, string workSheetFileName);
+	virtual bool buildWordList(std::vector<std::string> &allWords, std::string workSheetFileName);
 };
 
 }
 
-
 #endif	/* EXTRACT_NEW_SHEET_NAMES_H */
-

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.cpp

@@ -1,191 +1,216 @@
+// Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ftp_selection.h"
 
 #include <QtGui/QMessageBox>
 #include <QtNetwork/QFtp>
+
 namespace TranslationManager
 {
-    CFtpSelection::CFtpSelection(QWidget *parent): QDialog(parent)
+CFtpSelection::CFtpSelection(QWidget *parent): QDialog(parent)
-    {
+{
-        _ui.setupUi(this);
+	_ui.setupUi(this);
-        connect(_ui.connectButton, SIGNAL(clicked()), this, SLOT(ConnectButtonClicked()));
+	connect(_ui.connectButton, SIGNAL(clicked()), this, SLOT(ConnectButtonClicked()));
-        connect(_ui.doneButton, SIGNAL(clicked()), this, SLOT(DoneButtonClicked()));
+	connect(_ui.doneButton, SIGNAL(clicked()), this, SLOT(DoneButtonClicked()));
-		connect(_ui.cdToParrent, SIGNAL(clicked()), this, SLOT(cdToParent()));
+	connect(_ui.cdToParrent, SIGNAL(clicked()), this, SLOT(cdToParent()));
-        connect(_ui.cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(_ui.cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
 
-        // file list       
+	// file list
-        connect(_ui.fileList, SIGNAL(itemActivated(QTreeWidgetItem*,int)),this, SLOT(processItem(QTreeWidgetItem*,int)));
+	connect(_ui.fileList, SIGNAL(itemActivated(QTreeWidgetItem *,int)),this, SLOT(processItem(QTreeWidgetItem *,int)));
-        _ui.fileList->setEnabled(false);
+	_ui.fileList->setEnabled(false);
-        _ui.fileList->setRootIsDecorated(false);
+	_ui.fileList->setRootIsDecorated(false);
-        _ui.fileList->setHeaderLabels(QStringList() << tr("Name") << tr("Size") << tr("Owner") << tr("Group") << tr("Time"));
+	_ui.fileList->setHeaderLabels(QStringList() << tr("Name") << tr("Size") << tr("Owner") << tr("Group") << tr("Time"));
-        _ui.fileList->header()->setStretchLastSection(false);
+	_ui.fileList->header()->setStretchLastSection(false);
 
-		// buttons
+	// buttons
-		_ui.cdToParrent->setEnabled(false);
+	_ui.cdToParrent->setEnabled(false);
-		_ui.doneButton->setEnabled(false);
+	_ui.doneButton->setEnabled(false);
 
-		status = false;
+	status = false;
-    }
+}
 
-	// Connection with the FTP Server. We retrieve the file list.
+// Connection with the FTP Server. We retrieve the file list.
-    void CFtpSelection::ConnectButtonClicked()
+void CFtpSelection::ConnectButtonClicked()
-    {
+{
-        conn = new QFtp(this);
+	conn = new QFtp(this);
-        connect(conn, SIGNAL(commandFinished(int,bool)), this, SLOT(FtpCommandFinished(int,bool)));
+	connect(conn, SIGNAL(commandFinished(int,bool)), this, SLOT(FtpCommandFinished(int,bool)));
-        connect(conn, SIGNAL(listInfo(QUrlInfo)), this, SLOT(AddToList(QUrlInfo)));
+	connect(conn, SIGNAL(listInfo(QUrlInfo)), this, SLOT(AddToList(QUrlInfo)));
-		#ifndef QT_NO_CURSOR
-			setCursor(Qt::WaitCursor);
-		#endif       
-        QUrl url(_ui.url->text());
-        if (!url.isValid() || url.scheme().toLower() != QLatin1String("ftp")) {
-                conn->connectToHost(_ui.url->text(), 21);
-                conn->login();            
-        } else {
-                conn->connectToHost(url.host(), url.port(21));
 
-                if (!url.userName().isEmpty())
+	setCursor(Qt::WaitCursor);
-                        conn->login(QUrl::fromPercentEncoding(url.userName().toLatin1()), url.password());
-                else
-                        conn->login();
-                if (!url.path().isEmpty())
-                        conn->cd(url.path());
-        }
-    }
 
-	// Get the user action. 
+	QUrl url(_ui.url->text());
-    void CFtpSelection::FtpCommandFinished(int, bool error)
+	if (!url.isValid() || url.scheme().toLower() != QLatin1String("ftp"))
-    {
-		#ifndef QT_NO_CURSOR
-			setCursor(Qt::ArrowCursor);
-		#endif
-                if (conn->currentCommand() == QFtp::ConnectToHost) 
-                {
-                        if (error) 
-                        {
-                                QMessageBox::information(this, tr("FTP"),
-                                                             tr("Unable to connect to the FTP server "
-                                                                "at %1. Please check that the host "
-                                                                "name is correct.")
-                                                             .arg(_ui.url->text()));
-                                return;
-                        }
-
-                return;
-                }  
-                
-                if (conn->currentCommand() == QFtp::Login)
-                {
-                        conn->list();
-                }
-                
-				if (conn->currentCommand() == QFtp::Get) 
-				{
-					if(error)
-					{
-						status = false;
-						file->close();
-						file->remove();
-					} else {
-						file->close();
-						status = true;
-					}
-					_ui.cancelButton->setEnabled(true);
-				}
-
-                if (conn->currentCommand() == QFtp::List) 
-                {
-                        if (isDirectory.isEmpty()) {                               
-                                _ui.fileList->addTopLevelItem(new QTreeWidgetItem(QStringList() << tr("<empty>")));
-                                _ui.fileList->setEnabled(false);
-                        }                    
-                }
-    }
-	 // Make the file list with directories and files
-     void CFtpSelection::AddToList(const QUrlInfo &urlInfo)
-     {
-         QTreeWidgetItem *item = new QTreeWidgetItem;
-         item->setText(0, urlInfo.name());
-         item->setText(1, QString::number(urlInfo.size()));
-         item->setText(2, urlInfo.owner());
-         item->setText(3, urlInfo.group());
-         item->setText(4, urlInfo.lastModified().toString("MMM dd yyyy"));
-
-         QPixmap pixmap(urlInfo.isDir() ? ":/translationManager/images/dir.png" : ":/translationManager/images/file.png");
-         item->setIcon(0, pixmap);
-
-         isDirectory[urlInfo.name()] = urlInfo.isDir();
-         _ui.fileList->addTopLevelItem(item);
-         if (!_ui.fileList->currentItem()) {
-             _ui.fileList->setCurrentItem(_ui.fileList->topLevelItem(0));
-             _ui.fileList->setEnabled(true);
-         }
-     }
- 
-    void CFtpSelection::processItem(QTreeWidgetItem* item, int)
-    {
-        QString name = item->text(0);
-        if (isDirectory.value(name)) 
-        {
-                _ui.fileList->clear();
-                isDirectory.clear();
-                currentPath += '/';
-                currentPath += name;
-                conn->cd(name);
-                conn->list();
-				#ifndef QT_NO_CURSOR
-					setCursor(Qt::WaitCursor);
-				#endif   
-                return;
-        }  
-		_ui.doneButton->setEnabled(true);
-    }
-
-	// Exit from a directory
-	void CFtpSelection::cdToParent()
 	{
-		 #ifndef QT_NO_CURSOR
+		conn->connectToHost(_ui.url->text(), 21);
-			 setCursor(Qt::WaitCursor);
+		conn->login();
-		 #endif
+	}
-			 _ui.fileList->clear();
+	else
-			 isDirectory.clear();
+	{
-			 currentPath = currentPath.left(currentPath.lastIndexOf('/'));
+		conn->connectToHost(url.host(), url.port(21));
-			 if (currentPath.isEmpty()) {
+
-				 _ui.cdToParrent->setEnabled(false);
+		if (!url.userName().isEmpty())
-				 conn->cd("/");
+			conn->login(QUrl::fromPercentEncoding(url.userName().toLatin1()), url.password());
-			 } else {
+		else
-				 conn->cd(currentPath);
+			conn->login();
-			 }
+		if (!url.path().isEmpty())
-			 conn->list();
+			conn->cd(url.path());
+	}
+}
+
+// Get the user action.
+void CFtpSelection::FtpCommandFinished(int, bool error)
+{
+	setCursor(Qt::ArrowCursor);
+
+	if (conn->currentCommand() == QFtp::ConnectToHost)
+	{
+		if (error)
+		{
+			QMessageBox::information(this, tr("FTP"),
+									 tr("Unable to connect to the FTP server "
+										"at %1. Please check that the host "
+										"name is correct.")
+									 .arg(_ui.url->text()));
+			return;
+		}
+
+		return;
 	}
 
-	// Done action
+	if (conn->currentCommand() == QFtp::Login)
-    void CFtpSelection::DoneButtonClicked()
+	{
-    {
+		conn->list();
-		 QString fileName = _ui.fileList->currentItem()->text(0);
+	}
 
-		 if (QFile::exists(fileName)) {
+	if (conn->currentCommand() == QFtp::Get)
-			 QMessageBox::information(this, tr("FTP"),
+	{
-									  tr("There already exists a file called %1 in "
+		if(error)
-										 "the current directory.")
+		{
-									  .arg(fileName));
+			status = false;
-			 return;
+			file->close();
-		 }
+			file->remove();
+		}
+		else
+		{
+			file->close();
+			status = true;
+		}
+		_ui.cancelButton->setEnabled(true);
+	}
 
-		 file = new QFile(fileName);
+	if (conn->currentCommand() == QFtp::List)
-		 #ifndef QT_NO_CURSOR
+	{
-			setCursor(Qt::WaitCursor);
+		if (isDirectory.isEmpty())
-		 #endif  
+		{
-		 if (!file->open(QIODevice::WriteOnly)) {
+			_ui.fileList->addTopLevelItem(new QTreeWidgetItem(QStringList() << tr("<empty>")));
-			 QMessageBox::information(this, tr("FTP"),
+			_ui.fileList->setEnabled(false);
-									  tr("Unable to save the file %1: %2.")
+		}
-									  .arg(fileName).arg(file->errorString()));
+	}
-			 delete file;
+}
-			 return;
+// Make the file list with directories and files
-		 }
+void CFtpSelection::AddToList(const QUrlInfo &urlInfo)
-		 _ui.cancelButton->setEnabled(false);
+{
-		 conn->get(_ui.fileList->currentItem()->text(0), file);
+	QTreeWidgetItem *item = new QTreeWidgetItem;
+	item->setText(0, urlInfo.name());
+	item->setText(1, QString::number(urlInfo.size()));
+	item->setText(2, urlInfo.owner());
+	item->setText(3, urlInfo.group());
+	item->setText(4, urlInfo.lastModified().toString("MMM dd yyyy"));
 
-	     reject();   
+	QPixmap pixmap(urlInfo.isDir() ? ":/translationManager/images/dir.png" : ":/translationManager/images/file.png");
-    }
+	item->setIcon(0, pixmap);
+
+	isDirectory[urlInfo.name()] = urlInfo.isDir();
+	_ui.fileList->addTopLevelItem(item);
+	if (!_ui.fileList->currentItem())
+	{
+		_ui.fileList->setCurrentItem(_ui.fileList->topLevelItem(0));
+		_ui.fileList->setEnabled(true);
+	}
+}
+
+void CFtpSelection::processItem(QTreeWidgetItem *item, int)
+{
+	QString name = item->text(0);
+	if (isDirectory.value(name))
+	{
+		_ui.fileList->clear();
+		isDirectory.clear();
+		currentPath += '/';
+		currentPath += name;
+		conn->cd(name);
+		conn->list();
+
+		setCursor(Qt::WaitCursor);
+		return;
+	}
+	_ui.doneButton->setEnabled(true);
+}
+
+// Exit from a directory
+void CFtpSelection::cdToParent()
+{
+	setCursor(Qt::WaitCursor);
+
+	_ui.fileList->clear();
+	isDirectory.clear();
+	currentPath = currentPath.left(currentPath.lastIndexOf('/'));
+	if (currentPath.isEmpty())
+	{
+		_ui.cdToParrent->setEnabled(false);
+		conn->cd("/");
+	}
+	else
+	{
+		conn->cd(currentPath);
+	}
+	conn->list();
+}
+
+// Done action
+void CFtpSelection::DoneButtonClicked()
+{
+	QString fileName = _ui.fileList->currentItem()->text(0);
+
+	if (QFile::exists(fileName))
+	{
+		QMessageBox::information(this, tr("FTP"),
+								 tr("There already exists a file called %1 in "
+									"the current directory.")
+								 .arg(fileName));
+		return;
+	}
+
+	file = new QFile(fileName);
+
+	setCursor(Qt::WaitCursor);
+
+	if (!file->open(QIODevice::WriteOnly))
+	{
+		QMessageBox::information(this, tr("FTP"),
+								 tr("Unable to save the file %1: %2.")
+								 .arg(fileName).arg(file->errorString()));
+		delete file;
+		return;
+	}
+	_ui.cancelButton->setEnabled(false);
+	conn->get(_ui.fileList->currentItem()->text(0), file);
+
+	reject();
+}
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.h

@@ -8,6 +8,8 @@
 #ifndef FTP_SELECTION_H
 #define	FTP_SELECTION_H
 
+#include "ui_ftp_selection.h"
+
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 #include <QtGui/QDialog>
@@ -16,34 +18,33 @@
 #include <QtCore/QFile>
 #include <QtNetwork>
 
-#include "ui_ftp_selection.h"
+namespace TranslationManager
+{
 
-using namespace std;
+class CFtpSelection : public QDialog
+{
+	Q_OBJECT
 
-namespace TranslationManager {
+public:
+	CFtpSelection(QWidget *parent = 0);
+	~CFtpSelection() {}
+	bool status;
+	QFile *file;
 
-    class CFtpSelection : public QDialog
+private Q_SLOTS:
-    {
+	void cdToParent();
-        Q_OBJECT
+	void processItem(QTreeWidgetItem *,int);
-    private:
+	void ConnectButtonClicked();
-        Ui::FtpSelectionDialog _ui;
+	void DoneButtonClicked();
-        QFtp *conn;
+	void FtpCommandFinished(int, bool error);
-        QHash<QString, bool> isDirectory;
+	void AddToList(const QUrlInfo &urlInfo);
-        QString currentPath;
+
-    private Q_SLOTS:
+private:
-		void cdToParent();
+	Ui::FtpSelectionDialog _ui;
-        void processItem(QTreeWidgetItem*,int);
+	QFtp *conn;
-        void ConnectButtonClicked();
+	QHash<QString, bool> isDirectory;
-        void DoneButtonClicked();
+	QString currentPath;
-        void FtpCommandFinished(int, bool error);
+};
-        void AddToList(const QUrlInfo &urlInfo);
-    public:
-		bool status;
-		QFile *file;
-        CFtpSelection(QWidget* parent = 0);
-        ~CFtpSelection() {}
-    };
 }
 
 #endif	/* FTP_SELECTION_H */
-

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.cpp

@@ -1,39 +1,54 @@
-
+// Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
-#include <QtGui/qlistwidget.h>
+// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "source_selection.h"
 
+#include <QtGui/QListWidget>
+
 namespace TranslationManager
 {
 
-
 CSourceDialog::CSourceDialog(QWidget *parent): QDialog(parent)
 {
 	_ui.setupUi(this);
-	// Set signal and slot for "OK Button"         
+
 	connect(_ui.ok_button, SIGNAL(clicked()), this, SLOT(OkButtonClicked()));
-    // Set signal and slot for "Cancel Button"
+	connect(_ui.cancel_button, SIGNAL(clicked()), this, SLOT(reject()));
-    connect(_ui.cancel_button, SIGNAL(clicked()), this, SLOT(reject()));
+
-    _ui.sourceSelectionListWidget->setSortingEnabled(false);
+	_ui.sourceSelectionListWidget->setSortingEnabled(false);
 	connect(_ui.sourceSelectionListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
-		this, SLOT(itemDoubleClicked(QListWidgetItem *)));
+			this, SLOT(itemDoubleClicked(QListWidgetItem *)));
 }
 
 // Insert options in the source dialog. Options like: from FTP Server, from Local directory etc.
-void CSourceDialog::setSourceOptions(map<QListWidgetItem*,int> options)
+void CSourceDialog::setSourceOptions(std::map<QListWidgetItem *, int> &options)
 {
-    map<QListWidgetItem*,int>::iterator it;
+	std::map<QListWidgetItem *,int>::iterator it;
 
-    for(it = options.begin(); it != options.end(); ++it)
+	for(it = options.begin(); it != options.end(); ++it)
-    {
+	{
-        _ui.sourceSelectionListWidget->addItem((*it).first);
+		_ui.sourceSelectionListWidget->addItem((*it).first);
-    }
+	}
 }
 
 void CSourceDialog::OkButtonClicked()
 {
-    selected_item = _ui.sourceSelectionListWidget->currentItem();
+	selected_item = _ui.sourceSelectionListWidget->currentItem();
-    accept();
+	accept();
 }
 
 void CSourceDialog::itemDoubleClicked(QListWidgetItem *item)

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.h

@@ -1,16 +1,30 @@
-
+// Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SOURCE_SELECTION_H
 #define	SOURCE_SELECTION_H
 
+#include "ui_source_selection.h"
+
 #include <QtCore/QObject>
 #include <QtGui/QDialog>
 #include <QtCore/QString>
 #include <QtGui/QListWidgetItem>
-#include "ui_source_selection.h"
-#include <map>
 
-using namespace std;
+#include <map>
 
 namespace TranslationManager
 {
@@ -18,16 +32,19 @@ namespace TranslationManager
 class CSourceDialog : public QDialog
 {
 	Q_OBJECT
-private:
+
-	Ui::SourceSelectionDialog _ui;	
+public:
+	CSourceDialog(QWidget *parent = 0);
+	~CSourceDialog() {}
+	void setSourceOptions(std::map<QListWidgetItem *, int> &options);
+	QListWidgetItem *selected_item;
+
 private Q_SLOTS:
 	void OkButtonClicked();
 	void itemDoubleClicked(QListWidgetItem *item);
-public:
+
-	CSourceDialog(QWidget *parent = 0);
+private:
-	~CSourceDialog(){}
+	Ui::SourceSelectionDialog _ui;
-    void setSourceOptions(map<QListWidgetItem*, int> options);
-	QListWidgetItem *selected_item;
 };
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_constants.h

@@ -1,29 +1,38 @@
-/* 
+// Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
- * File:   translation_manager_constants.h
+// Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
- * Author: cemycc
+//
- *
+// This program is free software: you can redistribute it and/or modify
- * Created on July 5, 2011, 9:15 PM
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef TRANSLATION_MANAGER_CONSTANTS_H
 #define	TRANSLATION_MANAGER_CONSTANTS_H
 
 namespace TranslationManager
 {
-    namespace Constants
+namespace Constants
-    {
+{
-		const int ED_SHEET = 1;
+const int ED_SHEET = 1;
-		const int ED_PHRASE = 2;
+const int ED_PHRASE = 2;
 
-        const char * const WK_BOTNAMES = "bot_names_wk.txt";
+const char *const WK_BOTNAMES = "bot_names_wk.txt";
-        const char * const WK_ITEM = "item_words_wk.txt";
+const char *const WK_ITEM = "item_words_wk.txt";
-        const char * const WK_CREATURE = "creature_words_wk.txt";
+const char *const WK_CREATURE = "creature_words_wk.txt";
-        const char * const WK_SBRICK = "sbrick_words_wk.txt";
+const char *const WK_SBRICK = "sbrick_words_wk.txt";
-        const char * const WK_SPHRASE = "sphrase_words_wk.txt";
+const char *const WK_SPHRASE = "sphrase_words_wk.txt";
-        const char * const WK_PLACE = "place_words_wk.txt";
+const char *const WK_PLACE = "place_words_wk.txt";
-        const char * const WK_CONTINENT = "place_words_wk.txt";
+const char *const WK_CONTINENT = "place_words_wk.txt";
-        const char * const WK_STABLE = "place_words_wk.txt";
+const char *const WK_STABLE = "place_words_wk.txt";
-    }
+}
 }
 
 #endif	/* TRANSLATION_MANAGER_CONSTANTS_H */

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_editor.h

@@ -1,5 +1,4 @@
 // Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
 // Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,31 +24,30 @@
 #include <QtGui/QUndoStack>
 #include <QtCore/QFileInfo>
 
-namespace TranslationManager {
+namespace TranslationManager
+{
+
+class CEditor : public QMdiSubWindow
+{
+	Q_OBJECT
 
-class CEditor : public QMdiSubWindow {
-Q_OBJECT
-protected:
-	QUndoStack* current_stack;
-    QString current_file;
-	int editor_type;
-public:
-    CEditor(QMdiArea* parent) : QMdiSubWindow(parent) {}
-    CEditor() : QMdiSubWindow() {}
-    virtual void open(QString filename) =0;
-    virtual void save() =0;
-    virtual void saveAs(QString filename) =0;
-    virtual void activateWindow() =0;
 public:
+	CEditor(QMdiArea *parent) : QMdiSubWindow(parent) {}
+	CEditor() : QMdiSubWindow() {}
+	virtual void open(QString filename) =0;
+	virtual void save() =0;
+	virtual void saveAs(QString filename) =0;
+	virtual void activateWindow() =0;
+
 	int eType()
 	{
 		return editor_type;
 	}
-    QString subWindowFilePath()
+	QString subWindowFilePath()
-    {
+	{
-        return current_file;
+		return current_file;
-    }
+	}
-	void setUndoStack(QUndoStack* stack)
+	void setUndoStack(QUndoStack *stack)
 	{
 		current_stack = stack;
 	}
@@ -62,10 +60,12 @@ public:
 		setWindowFilePath(current_file);
 	}
 
+protected:
+	QUndoStack *current_stack;
+	QString current_file;
+	int editor_type;
 };
 
 }
 
-
 #endif	/* TRANSLATION_MANAGER_EDITOR_H */
-

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.h

@@ -1,5 +1,4 @@
 // Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
 // Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
@@ -15,20 +14,19 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 #ifndef MAIN_WINDOW_H
 #define MAIN_WINDOW_H
 
+// Project includes
+#include "ui_translation_manager_main_window.h"
+#include "translation_manager_editor.h"
+#include "source_selection.h"
+#include "editor_worksheet.h"
+#include "editor_phrase.h"
+
 // Project system includes
 #include "../core/icore_listener.h"
 
-// Nel includes
-#include "nel/misc/types_nl.h"
-#include "nel/misc/sheet_id.h"
-#include "nel/misc/path.h"
-#include "nel/misc/diff_tool.h"
-#include "nel/ligo/ligo_config.h"
-
 // Qt includes
 #include <QtCore/QObject>
 #include <QtGui/QUndoStack>
@@ -39,16 +37,15 @@
 #include <QtCore/QSignalMapper>
 #include <QtGui/QDialog>
 
-// Plugin includes
+// STL includes
-#include "translation_manager_editor.h"
-#include "source_selection.h"
-#include "ui_translation_manager_main_window.h"
 #include <set>
-#include "editor_worksheet.h"
-#include "editor_phrase.h"
-
-class QWidget;
 
+// Nel includes
+#include "nel/misc/types_nl.h"
+#include "nel/misc/sheet_id.h"
+#include "nel/misc/path.h"
+#include "nel/misc/diff_tool.h"
+#include "nel/ligo/ligo_config.h"
 
 using namespace std;
 
@@ -58,61 +55,64 @@ namespace TranslationManager
 class CMainWindow : public QMainWindow
 {
 	Q_OBJECT
+
 public:
-        CMainWindow(QWidget *parent = 0);
+	CMainWindow(QWidget *parent = 0);
-        virtual ~CMainWindow() {}
+	virtual ~CMainWindow() {}
-        QUndoStack *m_undoStack;
+	QUndoStack *m_undoStack;
+
 public:
-		Ui::CMainWindow _ui;
+	Ui::CMainWindow _ui;
+
 private:
-        // actions
+	// actions
-        QAction *openAct;
+	QAction *openAct;
-        QAction *saveAct;
+	QAction *saveAct;
-        QAction *saveAsAct;
+	QAction *saveAsAct;
-        QMenu *windowMenu;
+	QMenu *windowMenu;
-        QSignalMapper *windowMapper;
+	QSignalMapper *windowMapper;
-        // config
+	// config
-        QMap<string,bool> initialize_settings;
+	QMap<string,bool> initialize_settings;
-        QList<QString> filters;
+	QList<QString> filters;
-        QList<QString> languages;
+	QList<QString> languages;
-        QString level_design_path;
+	QString level_design_path;
-        QString primitives_path;
+	QString primitives_path;
-        QString translation_path;
+	QString translation_path;
-        QString work_path;
+	QString work_path;
-        NLLIGO::CLigoConfig ligoConfig;
+	NLLIGO::CLigoConfig ligoConfig;
+
 private Q_SLOTS:
-        void extractBotNames();
+	void extractBotNames();
-        void extractWords(QString typeq);
+	void extractWords(QString typeq);
-        void open();
+	void open();
-        void save();
+	void save();
-        void saveAs();
+	void saveAs();
-        void setActiveSubWindow(QWidget *window);
+	void setActiveSubWindow(QWidget *window);
-        void updateWindowsList();  
+	void updateWindowsList();
-        void mergeSingleFile();
+	void mergeSingleFile();
+
 private:
-        void openWorkFile(QString file);
+	void openWorkFile(QString file);
-        void updateToolbar(QMdiSubWindow *window);
+	void updateToolbar(QMdiSubWindow *window);
-        bool verifySettings();
+	bool verifySettings();
-        void readSettings();
+	void readSettings();
-        void createMenus();
+	void createMenus();
-        void createToolbar();
+	void createToolbar();
-        void initializeSettings(bool georges);
+	void initializeSettings(bool georges);
-        list<string> convertQStringList(QStringList listq);
+	std::list<std::string> convertQStringList(QStringList listq);
-	CEditor* getEditorByWindowFilePath(const QString &fileName);
+	CEditor *getEditorByWindowFilePath(const QString &fileName);
 	// Worksheet specific functions
-	CEditorWorksheet* getEditorByWorksheetType(const QString &type);
+	CEditorWorksheet *getEditorByWorksheetType(const QString &type);
-        bool isWorksheetEditor(QString filename);
+	bool isWorksheetEditor(QString filename);
 	bool isPhraseEditor(QString filename);
-		
-        
-        
 };
 
 class CCoreListener : public Core::ICoreListener
 {
 	Q_OBJECT
+
 public:
-	CCoreListener(CMainWindow* mainWindow, QObject *parent = 0): ICoreListener(parent) 
+	CCoreListener(CMainWindow *mainWindow, QObject *parent = 0): ICoreListener(parent)
 	{
 		m_MainWindow = mainWindow;
 	}
@@ -124,10 +124,6 @@ public:
 	CMainWindow *m_MainWindow;
 };
 
-
-
 } // namespace TranslationManager
 
-
+#endif
-
-#endif // SIMPLE_VIEWER_H

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_plugin.cpp

@@ -19,7 +19,8 @@
 #include "translation_manager_plugin.h"
 #include "translation_manager_settings_page.h"
 #include "translation_manager_main_window.h"
-// Project system includes
+
+// Core includes
 #include "../core/icore.h"
 #include "../core/core_constants.h"
 #include "../core/menu_manager.h"
@@ -65,11 +66,8 @@ bool TranslationManagerPlugin::initialize(ExtensionSystem::IPluginManager *plugi
 
 void TranslationManagerPlugin::extensionsInitialized()
 {
-
 }
 
-
-
 void TranslationManagerPlugin::setNelContext(NLMISC::INelContext *nelContext)
 {
 #ifdef NL_OS_WINDOWS
@@ -86,23 +84,6 @@ void TranslationManagerPlugin::addAutoReleasedObject(QObject *obj)
 	_autoReleaseObjects.prepend(obj);
 }
 
-QObject* TranslationManagerPlugin::objectByName(const QString &name) const
-{
-	Q_FOREACH (QObject *qobj, _plugMan->allObjects())
-	if (qobj->objectName() == name)
-		return qobj;
-	return 0;
-}
-
-ExtensionSystem::IPluginSpec *TranslationManagerPlugin::pluginByName(const QString &name) const
-{
-	Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins())
-	if (spec->name() == name)
-		return spec;
-	return 0;
-
-}
-
 }
 
 Q_EXPORT_PLUGIN(TranslationManager::TranslationManagerPlugin)

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_plugin.h

@@ -45,7 +45,7 @@ class IPluginSpec;
 namespace TranslationManager
 {
 
-    class CTranslationManagerContext;
+class CTranslationManagerContext;
 
 class TranslationManagerPlugin : public QObject, public ExtensionSystem::IPlugin
 {
@@ -58,12 +58,8 @@ public:
 	void extensionsInitialized();
 
 	void setNelContext(NLMISC::INelContext *nelContext);
-
 	void addAutoReleasedObject(QObject *obj);
 
-	QObject *objectByName(const QString &name) const;
-	ExtensionSystem::IPluginSpec *pluginByName(const QString &name) const;
-
 protected:
 	NLMISC::CLibraryContext *_LibContext;
 
@@ -75,8 +71,9 @@ private:
 class CTranslationManagerContext: public Core::IContext
 {
 	Q_OBJECT
+
 public:
-	CTranslationManagerContext(CMainWindow* mainWindow, QObject *parent = 0): IContext(parent)
+	CTranslationManagerContext(CMainWindow *mainWindow, QObject *parent = 0): IContext(parent)
 	{
 		m_MainWindow = mainWindow;
 	}
@@ -109,9 +106,8 @@ public:
 	}
 
 	CMainWindow *m_MainWindow;
-        
 };
 
-} // namespace Plugin
+}
 
 #endif // TRANSLATION_MANAGER_PLUGIN_H

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.cpp

@@ -1,5 +1,4 @@
 // Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
 // Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
@@ -17,17 +16,15 @@
 
 #include "translation_manager_settings_page.h"
 
+// Core includes
+#include "../core/icore.h"
+
 // Qt includes
 #include <QtCore/QSettings>
 #include <QtGui/QWidget>
 #include <QtGui/QFileDialog>
 #include <QtGui/QListWidgetItem>
 
-// NeL includes
-
-// Project includes
-#include "../core/icore.h"
-
 namespace TranslationManager
 {
 
@@ -68,20 +65,20 @@ QWidget *CTranslationManagerSettingsPage::createPage(QWidget *parent)
 {
 	_currentPage = new QWidget(parent);
 	_ui.setupUi(_currentPage);
-                  readSettings();
+	readSettings();
 	connect(_ui.filter_add, SIGNAL(clicked()), this, SLOT(filterAdd()));
 	connect(_ui.filter_del, SIGNAL(clicked()), this, SLOT(filterDel()));
 	connect(_ui.lang_add, SIGNAL(clicked()), this, SLOT(languageAdd()));
 	connect(_ui.lang_del, SIGNAL(clicked()), this, SLOT(languageDel()));
-                  connect(_ui.translation_add, SIGNAL(clicked()), this, SLOT(translationAdd()));
+	connect(_ui.translation_add, SIGNAL(clicked()), this, SLOT(translationAdd()));
-                  connect(_ui.work_add, SIGNAL(clicked()), this, SLOT(workAdd()));
+	connect(_ui.work_add, SIGNAL(clicked()), this, SLOT(workAdd()));
 
 	return _currentPage;
 }
 
 void CTranslationManagerSettingsPage::filterAdd()
 {
-        QString newValue = _ui.filter_edit->text();
+	QString newValue = _ui.filter_edit->text();
 	if (!newValue.isEmpty())
 	{
 		QListWidgetItem *newItem = new QListWidgetItem;
@@ -100,7 +97,7 @@ void CTranslationManagerSettingsPage::filterDel()
 
 void CTranslationManagerSettingsPage::languageAdd()
 {
-        QString newValue = _ui.lang_edit->text();
+	QString newValue = _ui.lang_edit->text();
 	if (!newValue.isEmpty())
 	{
 		QListWidgetItem *newItem = new QListWidgetItem;
@@ -119,43 +116,43 @@ void CTranslationManagerSettingsPage::languageDel()
 
 void CTranslationManagerSettingsPage::translationAdd()
 {
-        QString newPath = QFileDialog::getExistingDirectory(_currentPage, "");
+	QString newPath = QFileDialog::getExistingDirectory(_currentPage, "");
-        if (!newPath.isEmpty())
+	if (!newPath.isEmpty())
 	{
-                _ui.translation_edit->setText(newPath);
+		_ui.translation_edit->setText(newPath);
-        }    
+	}
 }
 
 void CTranslationManagerSettingsPage::workAdd()
 {
-        QString newPath = QFileDialog::getExistingDirectory(_currentPage, "");
+	QString newPath = QFileDialog::getExistingDirectory(_currentPage, "");
-        if (!newPath.isEmpty())
+	if (!newPath.isEmpty())
 	{
-                _ui.work_edit->setText(newPath);
+		_ui.work_edit->setText(newPath);
-        }     
+	}
 }
 
 void CTranslationManagerSettingsPage::apply()
 {
-        writeSettings();
+	writeSettings();
 }
 
 void CTranslationManagerSettingsPage::readSettings()
 {
 	QStringList filters, languages;
-        QString ligo, translation, work;
+	QString ligo, translation, work;
 
 	QSettings *settings = Core::ICore::instance()->settings();
 	settings->beginGroup("translationmanager");
 
-        filters = settings->value("filters").toStringList(); /* filters */
+	filters = settings->value("filters").toStringList(); /* filters */
-        languages = settings->value("trlanguages").toStringList(); /* languages */
+	languages = settings->value("trlanguages").toStringList(); /* languages */
-        ligo = settings->value("ligo").toString();
+	ligo = settings->value("ligo").toString();
-        translation = settings->value("translation").toString();
+	translation = settings->value("translation").toString();
-        work = settings->value("work").toString();
+	work = settings->value("work").toString();
 
 	settings->endGroup();
-        // filter
+	// filter
 	Q_FOREACH(QString filter, filters)
 	{
 		QListWidgetItem *newItem = new QListWidgetItem;
@@ -163,7 +160,7 @@ void CTranslationManagerSettingsPage::readSettings()
 		newItem->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 		_ui.filter_list->addItem(newItem);
 	}
-        // languages
+	// languages
 	Q_FOREACH(QString lang, languages)
 	{
 		QListWidgetItem *newItem = new QListWidgetItem;
@@ -171,37 +168,36 @@ void CTranslationManagerSettingsPage::readSettings()
 		newItem->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 		_ui.lang_list->addItem(newItem);
 	}
-        // translation 
+	// translation
-        _ui.translation_edit->setText(translation);
+	_ui.translation_edit->setText(translation);
-        // work 
+	// work
-        _ui.work_edit->setText(work);
+	_ui.work_edit->setText(work);
 
 }
 
 void CTranslationManagerSettingsPage::writeSettings()
 {
 	QStringList filters, languages;
-        QString ligo, translation, work;
+	QString ligo, translation, work;
-        // filters 
+	// filters
 	for (int i = 0; i < _ui.filter_list->count(); ++i)
 		filters << _ui.filter_list->item(i)->text();
-        // languages
+	// languages
 	for (int i = 0; i < _ui.lang_list->count(); ++i)
 		languages << _ui.lang_list->item(i)->text();
-        // translations path
+	// translations path
-        translation = _ui.translation_edit->text();
+	translation = _ui.translation_edit->text();
-        // work path
+	// work path
-        work = _ui.work_edit->text();
+	work = _ui.work_edit->text();
 
 	QSettings *settings = Core::ICore::instance()->settings();
 	settings->beginGroup("translationmanager");
-    settings->setValue("filters", filters);
+	settings->setValue("filters", filters);
-    settings->setValue("trlanguages", languages); 
+	settings->setValue("trlanguages", languages);
-    settings->setValue("translation", translation);
+	settings->setValue("translation", translation);
-    settings->setValue("work", work);
+	settings->setValue("work", work);
 	settings->endGroup();
-    settings->sync();
+	settings->sync();
 }
 
-
+}
-} /* namespace Plugin */

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.h

@@ -24,13 +24,9 @@
 
 #include "ui_translation_manager_settings_page.h"
 
-class QWidget;
-
 namespace TranslationManager
 {
-/**
+
-@class CTranslationManagerSettingsPage
-*/
 class CTranslationManagerSettingsPage : public Core::IOptionsPage
 {
 	Q_OBJECT
@@ -48,19 +44,19 @@ public:
 	virtual void apply();
 	virtual void finish() {}
 private Q_SLOTS:
-        void filterAdd();
+	void filterAdd();
-        void filterDel();
+	void filterDel();
-        void languageAdd();
+	void languageAdd();
-        void languageDel();
+	void languageDel();
-        void translationAdd();
+	void translationAdd();
-        void workAdd();
+	void workAdd();
 private:
 	QWidget *_currentPage;
 	Ui::CTranslationManagerSettingsPage _ui;
-        void writeSettings();
+	void writeSettings();
-        void readSettings();
+	void readSettings();
 };
 
-} // namespace Plugin
+}
 
 #endif // TRANSLATION_MANAGER_SETTINGS_H

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.ui

@@ -6,178 +6,152 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>533</width>
+    <width>589</width>
-    <height>478</height>
+    <height>490</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QGroupBox" name="groupBox">
+  <layout class="QGridLayout" name="gridLayout_5">
-   <property name="geometry">
+   <item row="0" column="0">
-    <rect>
+    <widget class="QGroupBox" name="groupBox">
-     <x>0</x>
+     <property name="title">
-     <y>10</y>
+      <string>Translation Manager Plugin</string>
-     <width>531</width>
+     </property>
-     <height>421</height>
+     <layout class="QGridLayout" name="gridLayout_4">
-    </rect>
+      <item row="0" column="0">
-   </property>
+       <layout class="QGridLayout" name="gridLayout">
-   <property name="title">
+        <item row="0" column="0">
-    <string>Translation Manager Plugin</string>
+         <widget class="QLabel" name="label_5">
-   </property>
+          <property name="text">
-   <widget class="QWidget" name="">
+           <string>Filters</string>
-    <property name="geometry">
+          </property>
-     <rect>
+         </widget>
-      <x>0</x>
+        </item>
-      <y>30</y>
+        <item row="0" column="1">
-      <width>521</width>
+         <widget class="QLineEdit" name="filter_edit"/>
-      <height>232</height>
+        </item>
-     </rect>
+        <item row="0" column="2">
-    </property>
+         <widget class="QToolButton" name="filter_add">
-    <layout class="QGridLayout" name="gridLayout">
+          <property name="text">
-     <item row="0" column="0">
+           <string/>
-      <widget class="QLabel" name="label_5">
+          </property>
-       <property name="text">
+          <property name="icon">
-        <string>Filters</string>
+           <iconset resource="../core/core.qrc">
-       </property>
+            <normaloff>:/core/icons/ic_nel_add_item.png</normaloff>:/core/icons/ic_nel_add_item.png</iconset>
-      </widget>
+          </property>
-     </item>
+          <property name="autoRaise">
-     <item row="0" column="1">
+           <bool>true</bool>
-      <widget class="QLineEdit" name="filter_edit"/>
+          </property>
-     </item>
+         </widget>
-     <item row="0" column="2">
+        </item>
-      <widget class="QToolButton" name="filter_add">
+        <item row="0" column="3">
-       <property name="text">
+         <widget class="QToolButton" name="filter_del">
-        <string/>
+          <property name="text">
-       </property>
+           <string/>
-       <property name="icon">
+          </property>
-        <iconset resource="../core/core.qrc">
+          <property name="icon">
-         <normaloff>:/core/icons/ic_nel_add_item.png</normaloff>:/core/icons/ic_nel_add_item.png</iconset>
+           <iconset resource="../core/core.qrc">
-       </property>
+            <normaloff>:/core/icons/ic_nel_delete_item.png</normaloff>:/core/icons/ic_nel_delete_item.png</iconset>
-       <property name="autoRaise">
+          </property>
-        <bool>true</bool>
+          <property name="autoRaise">
-       </property>
+           <bool>true</bool>
-      </widget>
+          </property>
-     </item>
+         </widget>
-     <item row="0" column="3">
+        </item>
-      <widget class="QToolButton" name="filter_del">
+        <item row="0" column="4">
-       <property name="text">
+         <widget class="QLabel" name="label_7">
-        <string/>
+          <property name="text">
-       </property>
+           <string>Languages</string>
-       <property name="icon">
+          </property>
-        <iconset resource="../core/core.qrc">
+         </widget>
-         <normaloff>:/core/icons/ic_nel_delete_item.png</normaloff>:/core/icons/ic_nel_delete_item.png</iconset>
+        </item>
-       </property>
+        <item row="0" column="5">
-       <property name="autoRaise">
+         <widget class="QLineEdit" name="lang_edit"/>
-        <bool>true</bool>
+        </item>
-       </property>
+        <item row="0" column="6">
-      </widget>
+         <widget class="QToolButton" name="lang_add">
-     </item>
+          <property name="text">
-     <item row="0" column="4">
+           <string/>
-      <widget class="QLabel" name="label_7">
+          </property>
-       <property name="text">
+          <property name="icon">
-        <string>Languages</string>
+           <iconset resource="../core/core.qrc">
-       </property>
+            <normaloff>:/core/icons/ic_nel_add_item.png</normaloff>:/core/icons/ic_nel_add_item.png</iconset>
-      </widget>
+          </property>
-     </item>
+          <property name="autoRaise">
-     <item row="0" column="5">
+           <bool>true</bool>
-      <widget class="QLineEdit" name="lang_edit"/>
+          </property>
-     </item>
+         </widget>
-     <item row="0" column="6">
+        </item>
-      <widget class="QToolButton" name="lang_add">
+        <item row="0" column="7">
-       <property name="text">
+         <widget class="QToolButton" name="lang_del">
-        <string/>
+          <property name="text">
-       </property>
+           <string/>
-       <property name="icon">
+          </property>
-        <iconset resource="../core/core.qrc">
+          <property name="icon">
-         <normaloff>:/core/icons/ic_nel_add_item.png</normaloff>:/core/icons/ic_nel_add_item.png</iconset>
+           <iconset resource="../core/core.qrc">
-       </property>
+            <normaloff>:/core/icons/ic_nel_delete_item.png</normaloff>:/core/icons/ic_nel_delete_item.png</iconset>
-       <property name="autoRaise">
+          </property>
-        <bool>true</bool>
+          <property name="autoRaise">
-       </property>
+           <bool>true</bool>
-      </widget>
+          </property>
-     </item>
+         </widget>
-     <item row="0" column="7">
+        </item>
-      <widget class="QToolButton" name="lang_del">
+        <item row="1" column="0" colspan="4">
-       <property name="text">
+         <widget class="QListWidget" name="filter_list"/>
-        <string/>
+        </item>
-       </property>
+        <item row="1" column="4" colspan="4">
-       <property name="icon">
+         <widget class="QListWidget" name="lang_list"/>
-        <iconset resource="../core/core.qrc">
+        </item>
-         <normaloff>:/core/icons/ic_nel_delete_item.png</normaloff>:/core/icons/ic_nel_delete_item.png</iconset>
+       </layout>
-       </property>
+      </item>
-       <property name="autoRaise">
+      <item row="1" column="0">
-        <bool>true</bool>
+       <layout class="QGridLayout" name="gridLayout_3">
-       </property>
+        <item row="0" column="0">
-      </widget>
+         <widget class="QLabel" name="label_8">
-     </item>
+          <property name="text">
-     <item row="1" column="0" colspan="4">
+           <string>Work directory</string>
-      <widget class="QListWidget" name="filter_list"/>
+          </property>
-     </item>
+         </widget>
-     <item row="1" column="4" colspan="4">
+        </item>
-      <widget class="QListWidget" name="lang_list"/>
+        <item row="1" column="0">
-     </item>
+         <widget class="QLineEdit" name="work_edit"/>
-    </layout>
+        </item>
-   </widget>
+        <item row="1" column="1">
-   <widget class="QWidget" name="">
+         <widget class="QToolButton" name="work_add">
-    <property name="geometry">
+          <property name="text">
-     <rect>
+           <string>...</string>
-      <x>0</x>
+          </property>
-      <y>340</y>
+         </widget>
-      <width>521</width>
+        </item>
-      <height>60</height>
+       </layout>
-     </rect>
+      </item>
-    </property>
+      <item row="2" column="0">
-    <layout class="QGridLayout" name="gridLayout_2">
+       <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
+        <item row="0" column="0">
-      <widget class="QLabel" name="label_6">
+         <widget class="QLabel" name="label_6">
-       <property name="text">
+          <property name="text">
-        <string>Translation directory</string>
+           <string>Translation directory</string>
-       </property>
+          </property>
-      </widget>
+         </widget>
-     </item>
+        </item>
-     <item row="1" column="0">
+        <item row="1" column="0">
-      <widget class="QLineEdit" name="translation_edit"/>
+         <widget class="QLineEdit" name="translation_edit"/>
-     </item>
+        </item>
-     <item row="1" column="1">
+        <item row="1" column="1">
-      <widget class="QToolButton" name="translation_add">
+         <widget class="QToolButton" name="translation_add">
-       <property name="text">
+          <property name="text">
-        <string>...</string>
+           <string>...</string>
-       </property>
+          </property>
-      </widget>
+         </widget>
-     </item>
+        </item>
-    </layout>
+       </layout>
-   </widget>
+      </item>
-   <widget class="QWidget" name="">
+     </layout>
-    <property name="geometry">
+    </widget>
-     <rect>
+   </item>
-      <x>0</x>
+  </layout>
-      <y>270</y>
-      <width>521</width>
-      <height>60</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Work directory</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLineEdit" name="work_edit"/>
-     </item>
-     <item row="1" column="1">
-      <widget class="QToolButton" name="work_add">
-       <property name="text">
-        <string>...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
  </widget>
  <resources>
   <include location="../core/core.qrc"/>

code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_model.cpp

@@ -0,0 +1,40 @@
+// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2011  Dzmitry Kamiahin <dnk-88@tut.by>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zone_painter_model.h"
+
+// STL includes
+
+// Qt includes
+
+// NeL includes
+
+namespace Plugin
+{
+
+CZonePainterModel::CZonePainterModel()
+{
+
+}
+
+CZonePainterModel::~CZonePainterModel()
+{
+
+}
+
+} /* namespace Plugin */
+

code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_model.h

@@ -0,0 +1,42 @@
+// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2011  Dzmitry Kamiahin <dnk-88@tut.by>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef ZONE_PAINTER_MODEL_H
+#define ZONE_PAINTER_MODEL_H
+
+// NeL includes
+#include <nel/misc/types_nl.h>
+#include <nel/misc/rgba.h>
+#include <nel/misc/event_emitter.h>
+
+// Qt includes
+
+namespace Plugin
+{
+
+class CZonePainterModel
+{
+public:
+	CZonePainterModel();
+	virtual ~CZonePainterModel();
+
+}; /* class CZonePainterModel */
+
+} /* namespace Plugin */
+
+
+#endif // ZONE_PAINTER_MODEL_H

code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_plugin.cpp

@@ -16,6 +16,7 @@
 #include <QtGui/QMenu>
 #include <QtGui/QAction>
 #include <QtGui/QMenuBar>
+#include <QtGui/QFileDialog>
 
 namespace Plugin
 {
@@ -39,6 +40,7 @@ bool ZonePainterPlugin::initialize(ExtensionSystem::IPluginManager *pluginManage
 	addAutoReleasedObject(new CZonePainterSettingsPage(this));
 	addAutoReleasedObject(new CZonePainterContext(this));
 	//addAutoReleasedObject(new CCoreListener(this));
+
 	return true;
 }
 
@@ -46,8 +48,26 @@ void ZonePainterPlugin::extensionsInitialized()
 {
 	Core::ICore *core = Core::ICore::instance();
 	Core::MenuManager *menuManager = core->menuManager();
+	QAction *loadZoneAction = new QAction("Load Zone", this);
+	QAction *saveZoneAction = new QAction("Save Zone", this);
+
+	QMenu *toolsMenu = menuManager->menu(Core::Constants::M_TOOLS);
+	QMenu *zoneMenu = toolsMenu->addMenu("Zone Painter");
+	zoneMenu->addAction(loadZoneAction);
+	connect(loadZoneAction, SIGNAL(triggered()), this, SLOT(clickLoadZoneAction()));
+	zoneMenu->addAction(saveZoneAction);
 }
 
+/****** SLOTS ******/
+void ZonePainterPlugin::clickLoadZoneAction() {
+	QString zoneFile = QFileDialog::getOpenFileName(NULL, tr("Open Zone File"), ".", tr("Zone Files (*.zone);;"));
+}
+
+void ZonePainterPlugin::clickSaveZoneAction() {
+
+}
+/****** END SLOTS ******/
+
 void ZonePainterPlugin::setNelContext(NLMISC::INelContext *nelContext)
 {
 #ifdef NL_OS_WINDOWS

code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_plugin.h

@@ -56,12 +56,17 @@ public:
 
 	void addAutoReleasedObject(QObject *obj);
 
+public Q_SLOTS:
+	void clickLoadZoneAction();
+	void clickSaveZoneAction();
 protected:
 	NLMISC::CLibraryContext *m_LibContext;
 
 private:
 	ExtensionSystem::IPluginManager *m_plugMan;
 	QList<QObject *> m_autoReleaseObjects;
+
+	NL3D::CLandscapeModel *m_Landscape;
 };
 
 class CZonePainterContext: public Core::IContext

code/nel/tools/build_gamedata/8_upload.py

@@ -57,7 +57,7 @@ printLog(log, "")
 Psftp = findFileMultiDir(log, ToolDirectories + WindowsExeDllCfgDirectories, UploadPsftpTool)
 printLog(log, "PSFTP " + Psftp)
 
-def downloadVersionTag(server, user, dir):
+def downloadVersionTag(server, user, sshkey, dir):
 	if os.path.isfile("upload.tag"):
 		os.remove("upload.tag")
 	if os.path.isfile("upload.batch"):
@@ -67,7 +67,7 @@ def downloadVersionTag(server, user, dir):
 	ub.write("get upload.tag upload.tag\n")
 	ub.write("quit\n")
 	ub.close()
-	subprocess.call([ Psftp, "-b", "upload.batch", user + "@" + server ])
+	subprocess.call([ Psftp, "-b", "upload.batch", "-i", sshkey, user + "@" + server ])
 	os.remove("upload.batch")
 	if os.path.isfile("upload.tag"):
 		ft = open("upload.tag")
@@ -122,8 +122,8 @@ def listDirectoryUpload(ft, ub, udb, dir):
 				printLog(log, "listDirectoryUpload: file not dir or file?!" + fileFull)
 	return nft
 
-def uploadSftp(server, user, dir_to, dir_from, addcmd):
+def uploadSftp(server, user, sshkey, dir_to, dir_from, addcmd):
-	ft = downloadVersionTag(server, user, dir_to)
+	ft = downloadVersionTag(server, user, sshkey, dir_to)
 	if isDirectoryNeeded(ft, dir_from):
 		if os.path.isfile("upload_dir.batch"):
 			os.remove("upload_dir.batch")
@@ -146,8 +146,8 @@ def uploadSftp(server, user, dir_to, dir_from, addcmd):
 		ub.close()
 		udb.write("quit\n")
 		udb.close()
-		subprocess.call([ Psftp, "-be", "-b", "upload_dir.batch", user + "@" + server ])
+		subprocess.call([ Psftp, "-be", "-b", "upload_dir.batch", "-i", sshkey, user + "@" + server ])
-		subprocess.call([ Psftp, "-b", "upload.batch", user + "@" + server ])
+		subprocess.call([ Psftp, "-b", "upload.batch", "-i", sshkey, user + "@" + server ])
 		os.remove("upload_dir.batch")
 		os.remove("upload.batch")
 		os.remove("upload.tag")
@@ -156,19 +156,23 @@ def uploadSftp(server, user, dir_to, dir_from, addcmd):
 
 printLog(log, ">>> Upload patch <<<")
 for target in UploadPatch:
-	uploadSftp(target[0], target[1], target[3], ClientPatchDirectory + "/patch", [ ])
+	uploadSftp(target[0], target[1], target[2], target[3], ClientPatchDirectory + "/patch", [ ])
 
 printLog(log, ">>> Upload data_shard <<<")
 for target in UploadShard:
-	uploadSftp(target[0], target[1], target[3], DataShardDirectory, [ "rm *.packed_sheets", "rm primitive_cache/*.binprim" ])
+	uploadSftp(target[0], target[1], target[2], target[3], DataShardDirectory, [ "rm *.packed_sheets", "rm primitive_cache/*.binprim" ])
 
 printLog(log, ">>> Upload data_common <<<")
 for target in UploadCommon:
-	uploadSftp(target[0], target[1], target[3], DataCommonDirectory, [ ])
+	uploadSftp(target[0], target[1], target[2], target[3], DataCommonDirectory, [ ])
 
-printLog(log, ">>> Upload data_leveldesign <<<")
+printLog(log, ">>> Upload data_leveldesign/leveldesign <<<")
 for target in UploadLeveldesign:
-	uploadSftp(target[0], target[1], target[3], LeveldesignDirectory, [ ])
+	uploadSftp(target[0], target[1], target[2], target[3], LeveldesignDirectory, [ ])
+
+printLog(log, ">>> Upload data_leveldesign/primitives <<<")
+for target in UploadPrimitives:
+	uploadSftp(target[0], target[1], target[2], target[3], PrimitivesDirectory, [ ])
 
 log.close()
 if os.path.isfile("8_upload.log"):

code/nel/tools/sound/CMakeLists.txt

@@ -1 +1,6 @@
+ADD_SUBDIRECTORY(build_samplebank)
+ADD_SUBDIRECTORY(build_sound)
+ADD_SUBDIRECTORY(build_soundbank)
 
+# Deprecated tool - no longer useful, valid or buildable.
+#ADD_SUBDIRECTORY(source_sounds_builder)

code/nel/tools/sound/build_samplebank/CMakeLists.txt

@@ -0,0 +1,13 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(build_samplebank ${SRC})
+
+ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(build_samplebank nelmisc nelsound)
+NL_DEFAULT_PROPS(build_samplebank "NeL, Tools, Sound: build_samplebank")
+NL_ADD_RUNTIME_FLAGS(build_samplebank)
+
+INSTALL(TARGETS build_samplebank RUNTIME DESTINATION bin COMPONENT toolssound)

code/nel/tools/sound/build_sound/CMakeLists.txt

@@ -0,0 +1,13 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(build_sound ${SRC})
+
+ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(build_sound nelmisc nelsound)
+NL_DEFAULT_PROPS(build_sound "NeL, Tools, Sound: build_sound")
+NL_ADD_RUNTIME_FLAGS(build_sound)
+
+INSTALL(TARGETS build_sound RUNTIME DESTINATION bin COMPONENT toolssound)

code/nel/tools/sound/build_soundbank/CMakeLists.txt

@@ -0,0 +1,13 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(build_soundbank ${SRC})
+
+ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(build_soundbank nelmisc nelsound)
+NL_DEFAULT_PROPS(build_soundbank "NeL, Tools, Sound: build_soundbank")
+NL_ADD_RUNTIME_FLAGS(build_soundbank)
+
+INSTALL(TARGETS build_soundbank RUNTIME DESTINATION bin COMPONENT toolssound)

code/ryzom/client/client_default.cfg

@@ -80,6 +80,9 @@ XMLOutGameInterfaceFiles = {
 	"out_v2_keys.xml",
 };
 
+TexturesInterface    = "texture_interfaces_v3";
+TexturesInterfaceDXTC = "texture_interfaces_dxtc";
+
 
 // The ligo primitive class file
 LigoPrimitiveClass = "world_editor_classes.xml";
@@ -351,8 +354,8 @@ SystemInfoColors =
 
 // NEW System Info Categories
 "SYS",	"255 255 255 255 normal",	// Default system messages
-"BC",	"255 255 255 255 center",	// Broadcast messages
+"BC",	"255 255 255 255 centeraround",	// Broadcast messages
-"TAGBC",	"255 255 255 255 center", // Taged broadcast messages : color should remain white as some word are tagged
+"TAGBC",	"255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
 "XP",	"255 255 64  255 over",		// XP Gain
 "SP",	"255 255 64  255 over",		// SP Gain
 "TTL",	"255 255 64  255 over",		// Title
@@ -440,6 +443,7 @@ R2EDReloadFiles      = {
 XMLInterfaceFiles    = {
 	"config.xml",
 	"widgets.xml",
+	"webig_widgets.xml",
 	"player.xml",
 	"inventory.xml",
 	"interaction.xml",
@@ -556,6 +560,15 @@ HelpPages =
 	"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
 };
 
+WebIgMainDomain      = "atys.ryzom.com";
+
+WebIgTrustedDomains  =
+{
+	"atys.ryzom.com" 
+};
+
+PatchletUrl          = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
+
 SelectedSlot = 0;
 
 BuildName = "RELEASE_HEAD";

code/ryzom/client/client_default.cfg.in

@@ -80,6 +80,9 @@ XMLOutGameInterfaceFiles = {
 	"out_v2_keys.xml",
 };
 
+TexturesInterface    = "texture_interfaces_v3";
+TexturesInterfaceDXTC = "texture_interfaces_dxtc";
+
 
 // The ligo primitive class file
 LigoPrimitiveClass = "world_editor_classes.xml";
@@ -352,8 +355,8 @@ SystemInfoColors =
 
 // NEW System Info Categories
 "SYS",	"255 255 255 255 normal",	// Default system messages
-"BC",	"255 255 255 255 center",	// Broadcast messages
+"BC",	"255 255 255 255 centeraround",	// Broadcast messages
-"TAGBC",	"255 255 255 255 center", // Taged broadcast messages : color should remain white as some word are tagged
+"TAGBC",	"255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
 "XP",	"255 255 64  255 over",		// XP Gain
 "SP",	"255 255 64  255 over",		// SP Gain
 "TTL",	"255 255 64  255 over",		// Title
@@ -441,6 +444,7 @@ R2EDReloadFiles      = {
 XMLInterfaceFiles    = {
 	"config.xml",
 	"widgets.xml",
+	"webig_widgets.xml",
 	"player.xml",
 	"inventory.xml",
 	"interaction.xml",
@@ -557,6 +561,15 @@ HelpPages =
 	"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
 };
 
+WebIgMainDomain      = "atys.ryzom.com";
+
+WebIgTrustedDomains  =
+{
+	"atys.ryzom.com" 
+};
+
+PatchletUrl          = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
+
 SelectedSlot = 0;
 
 BuildName = "RELEASE_HEAD";

code/ryzom/client/data/gamedev/interfaces_v3/commands.xml

@@ -78,9 +78,18 @@
 	<command name="guildinvite" action="command" params="a guildInvite $" />
 	<command name="invite" action="command" params="a teamInvite $" />
 
-	<command name="channel" action="command" params="a connectUserChannel +" />
+	<command name="channel" action="command" params='a connectUserChannel "$"' />
+	<command name="channel" action="command" params='a connectUserChannel "$" +' />
+
+	<command name="leaguekick" action="command" params="a leagueKick $" />
+	<command name="leaguequit" action="command" params="a setLeague" />
+	<command name="leagueinvite" action="command" params="a leagueInvite $" />
+	<command name="league" action="command" params='a setLeague "$"' />
+
+	<command name="resetname" action="command" params="a resetName"/>
 
 	<!-- WebIG -->
 	<command name="go" action="browse" params="name=ui:interface:webig:content:html|url=home"/>
+	<command name="webdev" action="browse" params="name=ui:interface:webig:content:html|url=http://localhost/index.html"/>
 
 </interface_config>

code/ryzom/client/data/gamedev/interfaces_v3/config.xml

@@ -258,6 +258,9 @@
   <variable entry="UI:SAVE:INSCENE:USER:TITLE"
             type="bool"
             value="false" />
+  <variable entry="UI:SAVE:INSCENE:USER:RPTAGS"
+            type="bool"
+            value="false" />
   <variable entry="UI:SAVE:INSCENE:USER:GUILD_NAME"
             type="bool"
             value="false" />
@@ -291,6 +294,9 @@
   <variable entry="UI:SAVE:INSCENE:FRIEND:TITLE"
             type="bool"
             value="true" />
+  <variable entry="UI:SAVE:INSCENE:FRIEND:RPTAGS"
+            type="bool"
+            value="true" />
   <variable entry="UI:SAVE:INSCENE:FRIEND:GUILD_NAME"
             type="bool"
             value="true" />
@@ -327,6 +333,9 @@
   <variable entry="UI:SAVE:INSCENE:ENEMY:TITLE"
             type="bool"
             value="true" />
+  <variable entry="UI:SAVE:INSCENE:ENEMY:RPTAGS"
+            type="bool"
+            value="true" />
   <variable entry="UI:SAVE:INSCENE:ENEMY:GUILD_NAME"
             type="bool"
             value="true" />
@@ -2797,6 +2806,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:GUILD_LIST:SORT_ORDER"
             type="sint32"
             value="0" />
+  <variable entry="UI:SAVE:CHATLOG_STATE"
+            type="sint32"
+            value="0" />
   <!-- Auto Convert ACT_TSTART end TEND from server to smoothServerTick -->
   <link expr="@SERVER:USER:ACT_TSTART"
         action="set"
@@ -2963,7 +2975,28 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:CHAT:COLORS:TELL"
             type="rgba"
             value="170 170 170 255" />
-  <variable entry="UI:SAVE:CHAT:COLORS:DYN"
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:0"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:1"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:2"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:3"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:4"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:5"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:6"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:7"
             type="rgba"
             value="162 255 173 255" />
   <variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
@@ -2975,6 +3008,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
              type="bool"
              value="false" />
+  <variable entry="UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
+             type="bool"
+             value="true" />
   <!-- ***************************** -->
   <!-- *    SYSTEM INFO COLORS     * -->
   <!-- ***************************** -->
@@ -3045,6 +3081,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_BAG:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_BAG:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA0:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3066,6 +3105,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA0:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA0:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA1:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3087,6 +3129,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA1:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA1:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA2:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3108,6 +3153,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA2:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA2:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA3:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3129,6 +3177,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA3:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA3:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_GUILD:SORT_TYPE"
             type="sint32"
             value="1" />
@@ -3151,6 +3202,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_GUILD:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_GUILD:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_ROOM:SORT_TYPE"
             type="sint32"
             value="1" />
@@ -3173,6 +3227,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_ROOM:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_ROOM:FILTER_TP"
+            type="sint32"
+            value="1" />
   <!-- List Menu 1 -->
   <variable entry="UI:VARIABLES:ISACTIVE:SETS"
             type="sint32"
@@ -3809,4 +3866,10 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:TEMP:R2_DRAW_ARRAY"
             type="bool"
             value="0" />
+  <variable entry="UI:TEMP:DEFAULT_WEB_RETRY_TIMEOUT"
+            type="sint32"
+            value="2" />
+  <variable entry="UI:SAVE:WEBIG_RETRY_DELAY"
+            type="sint32"
+            value="2" />
 </interface_config>

code/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml

@@ -11,7 +11,7 @@
 <variable entry="UI:VARIABLES:ENCY:REWARDBRICK:SHEET" type="sint32" value="0" />
 <variable entry="UI:VARIABLES:ENCY:ALBUMBRICK:SHEET" type="sint32" value="0" />
 
-<style style="ency_title" type="text" color="255 255 255 255" fontsize="14" shadow="true" case_mode="%case_first_string_letter_up"/>
+<style style="ency_title" type="text" color="255 255 255 255" fontsize="14" shadow="true" case_mode="%case_normal"/>
 <style style="ency_title2" type="text" color="255 255 255 192" fontsize="12" shadow="true" />
 
 

code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml

@@ -1615,19 +1615,82 @@
                   x="0"
                   y="-4" />
         <instance template="tgcw_color"
-                  id="cc_dyn"
+                  id="cc_dyn0"
-                  text="uiDynColor"
+                  text="uiDynColor0"
-                  title="uiCCDDyn"
+                  title="uiCCDDyn0"
-                  tooltip="uittChooseDynColor"
+                  tooltip="uittChooseDynColor0"
                   posref="BL TL"
                   posparent="cc_shout"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn1"
+                  text="uiDynColor1"
+                  title="uiCCDDyn1"
+                  tooltip="uittChooseDynColor1"
+                  posref="BL TL"
+                  posparent="cc_dyn0"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn2"
+                  text="uiDynColor2"
+                  title="uiCCDDyn2"
+                  tooltip="uittChooseDynColor2"
+                  posref="BL TL"
+                  posparent="cc_dyn1"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn3"
+                  text="uiDynColor3"
+                  title="uiCCDDyn3"
+                  tooltip="uittChooseDynColor3"
+                  posref="BL TL"
+                  posparent="cc_dyn2"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn4"
+                  text="uiDynColor4"
+                  title="uiCCDDyn4"
+                  tooltip="uittChooseDynColor4"
+                  posref="BL TL"
+                  posparent="cc_dyn3"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn5"
+                  text="uiDynColor5"
+                  title="uiCCDDyn5"
+                  tooltip="uittChooseDynColor5"
+                  posref="BL TL"
+                  posparent="cc_dyn4"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn6"
+                  text="uiDynColor6"
+                  title="uiCCDDyn6"
+                  tooltip="uittChooseDynColor6"
+                  posref="BL TL"
+                  posparent="cc_dyn5"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn7"
+                  text="uiDynColor7"
+                  title="uiCCDDyn7"
+                  tooltip="uittChooseDynColor7"
+                  posref="BL TL"
+                  posparent="cc_dyn6"
+                  x="0"
+                  y="-4" />
         <instance template="tgcw_checkbox"
                   id="enter_dontquit_cb"
                   text="uiEnterDontQuitCB"
                   tooltip="uittChatEnter"
-                  posparent="cc_dyn"
+                  posparent="cc_dyn7"
                   posref="BL TL"
                   x="0"
                   y="-8" />
@@ -1647,11 +1710,19 @@
                   posref="BL TL"
                   x="0"
                   y="-8" />
-        <instance template="tgcw_scrollbarint"
+        <instance template="tgcw_checkbox"
+                  id="show_online_offline_notifications_cb"
+                  text="uiShowOnlineOfflineNotifications"
+                  tooltip="uittShowOnlineOfflineNotifications"
+                  posparent="show_dyn_channel_name_in_chat_cb"
+                  posref="BL TL"
+                  x="0"
+                  y="-8" />
+		<instance template="tgcw_scrollbarint"
                   id="font_size"
                   text="uiFontSize"
                   posref="BL TL"
-                  posparent="show_dyn_channel_name_in_chat_cb"
+                  posparent="show_online_offline_notifications_cb"
                   x="0"
                   y="-8" />
         <link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
@@ -1660,7 +1731,9 @@
               target="show_times_in_chat_cb:c:pushed" />
         <link expr="@UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
               target="show_dyn_channel_name_in_chat_cb:c:pushed" />
-      </group>
+        <link expr="@UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
+              target="show_online_offline_notifications_cb:c:pushed" />
+	  </group>
       <ctrl style="skin_scroll"
             id="sb_chat_colors"
             align="T"
@@ -1886,12 +1959,20 @@
                   posparent="is_user_name"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_checkbox"
+                  id="is_user_rptags"
+                  text="uiRpTags"
+                  tooltip="uittRpTags"
+                  posref="BL TL"
+                  posparent="is_user_title"
+                  x="0"
+                  y="-4" />
         <instance template="tgcw_checkbox"
                   id="is_user_guild_name"
                   text="uigcGuildName"
                   tooltip="uittGuildName"
                   posref="BL TL"
-                  posparent="is_user_title"
+                  posparent="is_user_rptags"
                   x="0"
                   y="-4" />
         <instance template="tgcw_checkbox"
@@ -1995,12 +2076,20 @@
                   posparent="is_friend_name"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_checkbox"
+                  id="is_friend_rptags"
+                  text="uiRpTags"
+                  tooltip="uittRpTags"
+                  posref="BL TL"
+                  posparent="is_friend_title"
+                  x="0"
+                  y="-4" />                  
         <instance template="tgcw_checkbox"
                   id="is_friend_guild_name"
                   text="uigcGuildName"
                   tooltip="uittGuildName"
                   posref="BL TL"
-                  posparent="is_friend_title"
+                  posparent="is_friend_rptags"
                   x="0"
                   y="-4" />
         <instance template="tgcw_checkbox"
@@ -2112,12 +2201,20 @@
                   posparent="is_enemy_name"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_checkbox"
+                  id="is_enemy_rptags"
+                  text="uiRpTags"
+                  tooltip="uittRpTags"
+                  posref="BL TL"
+                  posparent="is_enemy_title"
+                  x="0"
+                  y="-4" />                    
         <instance template="tgcw_checkbox"
                   id="is_enemy_guild_name"
                   text="uigcGuildName"
                   tooltip="uittGuildName"
                   posref="BL TL"
-                  posparent="is_enemy_title"
+                  posparent="is_enemy_rptags"
                   x="0"
                   y="-4" />
         <instance template="tgcw_checkbox"
@@ -3095,10 +3192,45 @@
                widget="colbut"
                link="UI:SAVE:CHAT:COLORS:SHOUT"
                realtime="true" />
-        <param ui="chat_colors:cc_dyn:c"
+        <param ui="chat_colors:cc_dyn0:c"
                type="db"
                widget="colbut"
-               link="UI:SAVE:CHAT:COLORS:DYN"
+               link="UI:SAVE:CHAT:COLORS:DYN:0"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn1:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:1"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn2:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:2"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn3:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:3"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn4:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:4"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn5:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:5"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn6:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:6"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn7:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:7"
                realtime="true" />
         <!--
                         <param ui="chat_colors:cc_shout:c"              type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
@@ -3120,6 +3252,11 @@
                widget="boolbut"
                link="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
                realtime="true" />
+        <param ui="chat_colors:show_online_offline_notifications_cb:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
+               realtime="true" />
         <param ui="chat_colors:font_size:c"
                type="db"
                widget="sbint"
@@ -3222,6 +3359,11 @@
                widget="boolbut"
                link="UI:SAVE:INSCENE:USER:TITLE"
                realtime="true" />
+        <param ui="in_scene_user:is_user_rptags:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:INSCENE:USER:RPTAGS"
+               realtime="true" />
         <param ui="in_scene_user:is_user_guild_name:c"
                type="db"
                widget="boolbut"
@@ -3272,6 +3414,11 @@
                widget="boolbut"
                link="UI:SAVE:INSCENE:FRIEND:TITLE"
                realtime="true" />
+        <param ui="in_scene_friend:is_friend_rptags:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:INSCENE:FRIEND:RPTAGS"
+               realtime="true" />
         <param ui="in_scene_friend:is_friend_guild_name:c"
                type="db"
                widget="boolbut"
@@ -3327,6 +3474,11 @@
                widget="boolbut"
                link="UI:SAVE:INSCENE:ENEMY:TITLE"
                realtime="true" />
+        <param ui="in_scene_enemy:is_enemy_rptags:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:INSCENE:ENEMY:RPTAGS"
+               realtime="true" />
         <param ui="in_scene_enemy:is_enemy_guild_name:c"
                type="db"
                widget="boolbut"

code/ryzom/client/data/gamedev/interfaces_v3/guild.xml

@@ -463,27 +463,7 @@
   <!-- ***************** -->
   <!-- *  GUILD FORUM  * -->
   <!-- ***************** -->
-  <proc id="guild_forum_proc_active">
+ 
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=1" />
-    <action handler="set"
-            cond="not(%is_guild_present)"
-            params="target='ui:interface:guild_forum:active'|value=0" />
-    <action handler="browse"
-            params="name=ui:interface:guild_forum:content:html|url=home|show=0" />
-  </proc>
-  <proc id="guild_forum_proc_deactive">
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=0" />
-  </proc>
-  <group type="menu"
-         id="guild_forum_menu"
-         extends="base_menu_with_color">
-    <action id="home"
-            name="uiHOME"
-            handler="browse"
-            params="name=ui:interface:guild_forum:content:html|url=home" />
-  </group>
   <group type="container"
          id="guild_forum"
          w="480"
@@ -531,7 +511,7 @@
            w="0"
            h="0"
            posref="TL TL">
-      <group type="forum_html"
+      <group type="html"
              id="html"
              posref="TL TL"
              url="home"
@@ -828,24 +808,7 @@
   <!-- ************** -->
   <!-- *  MAIL BOX  * -->
   <!-- ************** -->
-  <proc id="mailbox_proc_active">
+ 
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:MAILBOX|value=1" />
-    <action handler="browse"
-            params="name=ui:interface:mailbox:content:html|url=home|show=0" />
-  </proc>
-  <proc id="mailbox_proc_deactive">
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:MAILBOX|value=0" />
-  </proc>
-  <group type="menu"
-         id="mailbox_menu"
-         extends="base_menu_with_color">
-    <action id="home"
-            name="uiHOME"
-            handler="browse"
-            params="name=ui:interface:mailbox:content:html|url=home" />
-  </group>
   <group type="container"
          id="mailbox"
          w="480"
@@ -892,7 +855,7 @@
            w="0"
            h="0"
            posref="TL TL">
-      <group type="mail_html"
+      <group type="html"
              id="html"
              posref="TL TL"
              url="home"
@@ -976,8 +939,6 @@
   <proc id="webig_proc_active">
     <action handler="set"
             params="dblink=UI:VARIABLES:ISACTIVE:WEBIG|value=1" />
-    <action handler="browse"
-            params="name=ui:interface:webig:content:html|url=home" />
   </proc>
   <proc id="webig_proc_deactive">
     <action handler="set"
@@ -1088,7 +1049,7 @@
       <group type="webig_html"
              id="html"
              posref="TL TL"
-             url="http://atys.ryzom.com/start/index.php"
+             url=""
              home="http://atys.ryzom.com/start/index.php"
              sizeref="wh"
              x="0"
@@ -1254,8 +1215,8 @@
       <group type="webig_html"
              id="html"
              posref="TL TL"
-             url="http://atys.ryzom.com/start/app_ig_start.php"
+             url=""
-             home="http://atys.ryzom.com/start/app_ig_start.php"
+             home="http://atys.ryzom.com/start/init_ig.php"
              sizeref="wh"
              x="0"
              y="0"

code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua

@@ -283,17 +283,14 @@ function game:onDrawNpcWebPage()
 			local utf8Url = ucUrl:toUtf8()
 			local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil			
 			if isRing then
-				-- when in ring mode, add the parameters ourselves. 60 sec timeout because of zope...
-				-- browseNpcWebPage(uiStr, utf8Url .. game.RingAccessPointFilter:getURLParameters(), false, 60)
-				-- Use new window after revamp
-				--RingAccessPoint:getWindow().active = 1
-				--RingAccessPoint:getWindow():center()
-				--RingAccessPoint:getWindow():blink(1)
-				--RingAccessPoint:show()
 				getUI("ui:interface:npc_web_browser").active = false
 				runAH(nil, "context_ring_sessions", "")
 				return
 			else
+				local hideWindow = string.find(utf8Url, "_hideWindow=1") ~= nil			
+				if hideWindow then
+					getUI("ui:interface:npc_web_browser").active = false
+				end
 				self.NpcWebPage.BrowseDone= true;
 				browseNpcWebPage(uiStr, utf8Url, true, 10); -- 'true' is for 'add parameters' here. 10 is standard timeout
 			end
@@ -302,9 +299,9 @@ function game:onDrawNpcWebPage()
 			-- if this is a ring window, then only the refresh button to access to filter will be available
 			local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
 			local browser = getUI("ui:interface:npc_web_browser")
-			browser:find("browse_redo").active = not isRing
+			browser:find("browse_redo").active = true
-			browser:find("browse_undo").active = not isRing
+			browser:find("browse_undo").active = true
-			browser:find("browse_refresh").active = isRing
+			browser:find("browse_refresh").active = true
 		end
 	end
 end
@@ -978,6 +975,7 @@ function RingPlayerInfo:tooltipRRPs(dbBase, ttFormat)
 	setContextHelpText(fmt);
 end
 
+
 --------------------------------------------------------------------------------------------------------------
 --
 function RingPlayerInfo:tooltipRingRating(level, progress, ttFormat)
@@ -1012,6 +1010,27 @@ function RingPlayerInfo:getLevelRatingAndImprovementRate(val)
 	return level, progress
 end
 
+--------------------------------------------------------------------------------------------------------------
+--
+function game:updateOrganization(path, uiOrgText, uiStatusText, uiPointsText)
+	
+	local org = getDbProp(path.."1:VALUE")
+	getUICaller()[uiOrgText].uc_hardtext =  i18n.get('uiOrganization_' .. org)
+
+	local status = getDbProp(path.."2:VALUE")
+	getUICaller()[uiStatusText].uc_hardtext= status
+
+	local points = getDbProp(path.."3:VALUE")
+	getUICaller()[uiPointsText].uc_hardtext= points
+	
+end
+
+------------------------------------------------------------------------------------------------------------
+function game:organizationTooltip()
+	-- set the tooltip in InterfaceManager
+	setContextHelpText( i18n.get('uittOrganization') );
+end
+
 
 --------------------------------------------------------------------------------------------------------------
 function game:popMissionList()		
@@ -1393,6 +1412,8 @@ end
 function game:onMainLoopBegin()	
 	game.InGameDbInitialized = false			
 	game.PrevSessionMission = getDbProp("UI:VARIABLES:MISSION_SELECTED_PREV_SESSION")
+	
+	debugInfo("onMainLoopBegin()")
 end
 
 
@@ -1408,6 +1429,29 @@ function game:onInGameDbInitialized()
 	if game.PrevSessionMission ~= -1  then
 		self:setCurrentMission(game.PrevSessionMission)		
 	end
+	
+	game:setInfoPlayerCharacterRace()
+end
+
+function game:onWebIgReady()
+	-- Call init webig
+	getUI("ui:interface:web_transactions:content:html"):browse("home")
+	getUI("ui:interface:webig:content:html"):browse("home")
+	
+end
+
+--------------------------------------------------------------------------------------------------------------
+-- handler called by C++ at the start of a far TP (log to char selection or far tp)
+function game:onFarTpStart()
+	debugInfo("game:onFarTpStart()")
+	--game:deinitWebIgApps()
+end
+
+--------------------------------------------------------------------------------------------------------------
+-- handler called by C++ after characer reselection or the end of a far TP
+function game:onFarTpEnd()
+	debugInfo("game:onFarTpEnd()")
+	--game:preInitWebIgApps()
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1415,8 +1459,8 @@ end
 function game:onMainLoopEnd()
 	game.InGameDbInitialized = false
 	game:updateMissionJournalFixedEntry()
-end
 
+end
 
 --------------------------------------------------------------------------------------------------------------
 -- ring journal on / off
@@ -1471,6 +1515,11 @@ function game:onNewMissionStepAdded(stepIndex)
 	local missionWnd = getMissionWindow()
 	local missionIndex = getDbProp("UI:SAVE:MISSION_SELECTED")
 	local dbPath
+
+	if missionIndex < 0 then
+		return
+	end
+
 	-- debugInfo("New Step")
 	if missionIndex < 15 then		
 		dbPath = "SERVER:MISSIONS:" .. tostring(missionIndex) .. ":GOALS:" .. tostring(stepIndex) .. ":TEXT"
@@ -1651,3 +1700,64 @@ function game:getRPJobs()
 
 end
 
+--------------------------------------------------------------------------------------------------------------
+function game:setInfoPlayerCharacterRace()
+	getUI("ui:interface:info_player_skills:content:basics_skills:character_race_name").uc_hardtext = i18n.get("io"..getUserRace())
+end
+
+
+-- --------------------------------------------------------------------------------------------------------------
+-- game.preInitTimer = 0
+-- function game:preInitWebIgAppsLoop()
+	-- if game.preInitTimer == nil then game.preInitTimer = 0 end
+
+	-- game.preInitTimer = game.preInitTimer - 1
+	-- if (not game.preWebIgAppsInitialized) and game.preInitTimer < 0 then
+		-- debugInfo("initWebIgAppsLoop(): calling app_ig_preinit.php")
+		-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_preinit.php")
+		-- game.preInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
+	-- end
+
+	-- if game.preWebIgAppsInitialized then
+		-- debugInfo("preInitWebIgAppsLoop(): Calling removeOnDbChange()")
+		-- removeOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
+	-- end
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:preInitWebIgApps()
+	-- debugInfo("game:preInitWebIgApps()")
+	-- addOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:preInitWebIgAppsLoop()")
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- game.postInitTimer = 0
+-- function game:postInitWebIgAppsLoop()
+	-- if game.postInitTimer == nil then game.postInitTimer = 0 end
+
+	-- game.postInitTimer = game.postInitTimer - 1
+	-- if game.postInitTimer < 0 then
+		-- debugInfo("initWebIgAppsLoop(): calling app_ig_postinit.php")
+		-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_postinit.php")
+		-- game.postInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
+	-- end
+
+	-- if game.postWebIgAppsInitialized then
+		-- debugInfo("postInitWebIgAppsLoop(): Calling removeOnDbChange()")
+		-- removeOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
+	-- end
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:postInitWebIgApps()
+	-- debugInfo("game:postInitWebIgApps()")
+	-- addOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:postInitWebIgAppsLoop()")
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:deinitWebIgApps()
+	-- debugInfo("game:deinitWebIgApps()")
+	-- game.preWebIgAppsInitialized = nil
+	-- game.postWebIgAppsInitialized = nil
+	-- titleSetted = nil
+-- end

code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml

@@ -676,54 +676,32 @@
              y="0"
              h="0"
              posref="TL TL">
-        <group id="title"
+		<view type="text"
-               posref="TL TL"
+			  id="character_race_title"
-               sizeref="w"
+			  posparent="basics_skills"
-               w="-1"
+			  posref="TL TL"
-               h="24"
+			  x="0"
-               y="-22">
+			  y="-24"
-          <view type="text"
+			  hardtext="uiRaceBold"
-                id="player_title_txt"
+			  shadow="true"
-                posref="TL TL"
+			  color="255 255 255 255"
-                x="0"
+			  global_color="false"
-                y="-4"
+			  fontsize="12" />
-                hardtext="uiPlayerTitle"
+		<view type="text"
-                shadow="true"
+			  id="character_race_name"
-                color="255 255 255 255"
+			  posparent="character_race_title"
-                global_color="false"
+			  posref="TR TL"
-                fontsize="12" />
+			  shadow="true"
-          <group type="combo_box"
+			  color="255 200 55 255"
-                 id="player_title"
+			  global_color="false"
-                 w="300"
+			  x="2"
-                 h="20"
+			  fontsize="12"
-                 value="UI:TITLE"
+			  hardtext="" />
-                 posparent="player_title_txt"
-                 posref="TR TL"
-                 x="4"
-                 y="4"
-                 on_select_start="title_combobox_button">
-            <instance template="combo_box_def1" />
-          </group>
-          <instance template="text_tt"
-                    posparent="player_title"
-                    tooltip="uittIdentityTitle" />
-          <link expr="@UI:TITLE"
-                action="title_combobox_changed" />
-        </group>
-        <ctrl style="text_button_16"
-              id="inf"
-              posref="TR TR"
-              y="-24"
-              wmargin="8"
-              hardtext="uiInfo"
-              tooltip="uittIdentityInfo"
-              onclick_l="open_title_help"
-              params_l="from=user" />
         <group id="guild"
                posref="TL TL"
                sizeref="w"
                h="14"
-               y="-52">
+               y="-48">
           <view type="text"
                 id="guild_title"
                 posref="TL TL"
@@ -1231,23 +1209,23 @@
                       posref="BL TL"
                       y="0"
                       val="%player_protect_cold" />
-            <instance template="tipc_magic_protect"
-                      id="Fire"
-                      posparent="Cold"
-                      posref="BL TL"
-                      y="0"
-                      val="%player_protect_fire" />
             <instance template="tipc_magic_protect"
                       id="Rot"
-                      posparent="Fire"
+                      posparent="Cold"
                       posref="BL TL"
                       y="0"
                       val="%player_protect_rot" />
             <instance template="tipc_magic_protect"
-                      id="Shockwave"
+                      id="Fire"
                       posparent="Rot"
                       posref="BL TL"
                       y="0"
+                      val="%player_protect_fire" />
+            <instance template="tipc_magic_protect"
+                      id="Shockwave"
+                      posparent="Fire"
+                      posref="BL TL"
+                      y="0"
                       val="%player_protect_shockwave" />
             <instance template="tipc_magic_protect"
                       id="Poison"
@@ -1420,9 +1398,60 @@
               fontsize="12" />
         <instance template="faction_points_widget"
                   id="fp"
-                  posref="TL TL"
+                  posparent="ecosystem_points"
+                  posref="BL TL"
                   x="0"
-                  y="-150" />
+                  y="-10" />
+        <group id="pvp_points"
+			   posparent="fp"
+               posref="BL TL"
+               sizeref="wh"
+               w="-1"
+               h="40"
+               y="-10">
+          <view type="text"
+                id="pvppoints_t"
+                posref="TL TL"
+                x="0"
+                y="0"
+                hardtext="uiPvpPoints"
+                shadow="true"
+                color="255 255 255 255"
+                global_color="false"
+                fontsize="12" />
+          <group id="black"
+                 posref="TL TL"
+                 x="0"
+                 sizeref="w"
+                 y="-14"
+                 w="0"
+                 h="26"
+                 inherit_gc_alpha="true">
+			  <view type="text"
+					id="total"
+					posref="ML ML"
+					x="8"
+					y="0"
+					hardtext="uiPvpTotal"
+					shadow="true"
+					color="255 255 255 255"
+					global_color="true"
+					fontsize="12" />
+			  <view type="text_number"
+					id="val"
+					posref="MR MR"
+					x="-8"
+					y="0"
+					color="255 255 255 255"
+					global_color="true"
+					fontsize="12"
+					value="SERVER:USER:RRPS_LEVELS0:VALUE"
+					shadow="true" />
+          </group>
+          <instance template="inner_thin_border"
+                    posparent="black"
+                    inherit_gc_alpha="true" />
+        </group>
       </group>
 	  <group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
 	        <ctrl style="text_button_header"
@@ -1514,11 +1543,57 @@
 			 </group>
 		</group>
 		<group h="0" id="webinfos" posref="TL TL" sizeref="wh" w="0" y="0">
+			<group id="title"
+				   posref="TL TL"
+				   sizeref="w"
+				   active="true"
+				   w="-1"
+				   h="24"
+				   y="-8">
+			  <view type="text"
+					id="player_title_txt"
+					posref="TL TL"
+					x="8"
+					y="-4"
+					hardtext="uiPlayerTitle"
+					shadow="true"
+					color="255 255 255 255"
+					global_color="false"
+					fontsize="12" />
+			  <group type="combo_box"
+					 id="player_title"
+					 w="300"
+					 h="20"
+					 value="UI:TITLE"
+					 posparent="player_title_txt"
+					 posref="TR TL"
+					 x="4"
+					 y="4"
+					 on_select_start="title_combobox_button">
+				<instance template="combo_box_def1" />
+			  </group>
+			  <instance template="text_tt"
+						posparent="player_title"
+						tooltip="uittIdentityTitle" />
+			  <link expr="@UI:TITLE"
+					action="title_combobox_changed" />
+			</group>
+			<ctrl style="text_button_16"
+				  id="inf"
+				  posref="TR TR"
+				  active="true"
+				  y="-9"
+				  wmargin="8"
+				  hardtext="uiInfo"
+				  tooltip="uittIdentityInfo"
+				  onclick_l="open_title_help"
+				  params_l="from=user" />
 	        <ctrl style="text_button_header"
             button_type="push_button"
             id="browse_home"
-            posref="TR TR"
+            posref="BR TR"
-            x="-1"
+			posparent="title"
+            x="0"
             y="-2"
             hardtext="uiBrowseRefresh"
             tooltip="uittBrowseRefresh"
@@ -1533,7 +1608,7 @@
              title_prefix=""
              sizeref="wh"
              x="0"
-             y="-8"
+             y="-42"
              w="0"
              h="0"
              background_color="0 0 0 255"
@@ -1905,7 +1980,7 @@
     <group id="content"
            x="0"
            y="0"
-           h="272"
+           h="300"
            posref="TL TL">
       <group id="you"
              posref="TL TL"
@@ -2004,7 +2079,7 @@
               id="kami"
               posref="TL TL"
               x="4"
-              y="-180"
+              y="-160"
               color="255 255 255 255"
               fontsize="10"
               shadow="true"
@@ -2013,7 +2088,7 @@
               id="karavan"
               posref="TL TL"
               x="4"
-              y="-210"
+              y="-190"
               color="255 255 255 255"
               fontsize="10"
               shadow="true"
@@ -2021,7 +2096,7 @@
         <group id="cult_allegiance_group"
                posref="TL TL"
                x="4"
-               y="-240"
+               y="-220"
                child_resize_h="true"
                child_resize_w="true">
           <view type="text"
@@ -2090,6 +2165,87 @@
                   id="fb5"
                   x="100"
                   path="SERVER:FAME:PLAYER5" />
+       <view type="text"
+                id="organization_text"
+                posref="TL TL"
+                x="0"
+                y="-245"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="true"
+                shadow="true"
+                hardtext="uiOrganization" />
+       <group id="organization"
+               posref="TL TL"
+               x="2"
+               y="-260"
+               h="34"
+               w="-4"
+               sizeref="w" >
+        <view type="text"
+                id="name"
+                posref="TL TL"
+                x="2"
+                y="-5"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="false"
+                shadow="true"
+                hardtext="" /> 
+         <view type="text"
+                id="text_points"
+                posref="BL BL"
+                x="4"
+                y="2"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="true"
+                shadow="true"
+                hardtext="uiPoints" />
+         <view type="text"
+                id="points"
+                posparent="text_points"
+                posref="MR ML"
+                x="4"
+                y="0"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="false"
+                shadow="true"
+                hardtext="0" />
+            <view type="text"
+                id="status"
+                posref="BR BR"
+                x="-4"
+                y="2"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="false"
+                shadow="true"
+                hardtext="0" />
+          <view type="text"
+                id="text_status"
+                posparent="status"
+                posref="ML MR"
+                x="-4"
+                y="0"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="true"
+                shadow="true"
+                hardtext="uiSkillJobLVL" />
+          <link expr="@SERVER:USER:RRPS_LEVELS1"
+                action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
+          <link expr="@SERVER:USER:RRPS_LEVELS2"
+                action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
+          <link expr="@SERVER:USER:RRPS_LEVELS3"
+                action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
+          <instance template="text_tt"
+                    posparent="parent"
+                    on_tooltip="lua:game:organizationTooltip()" />
+          <instance template="inner_thin_border"
+                    inherit_gc_alpha="true" />
+        </group>
       </group>
       <group id="guild"
              posref="TL TL"

code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml

@@ -301,7 +301,6 @@
       <view type="bitmap"
             id="tag_1"
             posref="TL TL"
-			posparent="pvp_tags"
             x="2"
             y="0"
             texture="alpha_10.tga"
@@ -2116,7 +2115,14 @@
             name="uimDismiss"
             handler="dismiss_member"
             params="" />
-    <!--            <action id="successor"  name="uimSetSuccesor" handler="set_successor" params=""/>-->
+    <action id="leader"
+            name="uimSetTeamLeader"
+            handler="set_team_leader"
+            params=""/>
+    <action id="successor"
+            name="uimSetSuccesor"
+            handler="set_successor"
+            params=""/>
     <!--            <action id="emote" name="uimEmotes" hanlder="" params="">
                         <action id="emote1"  name="uimEmote1" handler="emote" params="emote_id=0"/>     
                         <action id="emote2"  name="uimEmote2" handler="emote" params="emote_id=1"/>     
@@ -2147,6 +2153,10 @@
   <!-- links to enable leader options -->
   <link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
         target="ui:interface:team_member_menu:dismiss:active" />
+  <link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
+        target="ui:interface:team_member_menu:leader:active" />
+  <link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
+        target="ui:interface:team_member_menu:successor:active" />
   <!-- menu on the chat of the team for the leader -->
   <group type="menu"
          id="team_chat_leader_menu"
@@ -2481,21 +2491,13 @@
     <view type="text"
           id="text"
           posref="TM TM"
-          color="233 197 42 255"
+          color="42 197 233 255"
           x="10"
           y="-10"
-          fontsize="14"
+          fontsize="12"
           global_color="false"
           shadow="true"
-          hardtext="uiJoinDuelProposal" />
+          hardtext="uiJoinLeagueProposal" />
-    <view type="bitmap"
-          id="warning"
-          posparent="text"
-          posref="ML MR"
-          y="4"
-          x="-4"
-          global_color="false"
-          texture="w_warning.tga" />
     <group id="content"
            child_resize_h="true"
            child_resize_hmargin="10">