merged default into gsoc2011-translationovqt

--HG--
branch : gsoc2011-translationovqt

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

@@ -188,6 +188,9 @@ bool GlWndProc(CDriverGL *driver, const void* e)
 static Atom XA_WM_STATE = 0;
 static Atom XA_WM_STATE_FULLSCREEN = 0;
 static Atom XA_WM_ICON = 0;
+static Atom XA_WM_WINDOW_TYPE = 0;
+static Atom XA_WM_WINDOW_TYPE_NORMAL = 0;
+static Atom XA_FRAME_EXTENTS = 0;
 
 sint nelXErrorsHandler(Display *dpy, XErrorEvent *e)
 {
@@ -233,7 +236,7 @@ bool GlWndProc(CDriverGL *driver, XEvent &e)
 		break;
 
 		case Expose:
-		nlwarning("Expose event");
+//		nlwarning("Expose event");
 		break;
 
 		case ConfigureNotify:
@@ -243,20 +246,36 @@ bool GlWndProc(CDriverGL *driver, XEvent &e)
 			// first time setting decoration sizes
 			if ((driver->_DecorationWidth == -1) || (driver->_DecorationWidth == 0))
 			{
-				driver->_DecorationWidth = e.xconfigure.x - driver->_WindowX;
+				Atom type_return = 0;
-				driver->_DecorationHeight = e.xconfigure.y - driver->_WindowY;
+				int format_return = 0;
+				unsigned long nitems_return = 0;
+				unsigned long bytes_after_return = 0;
+				long *data = NULL;
 			
-				nlwarning("Decoration size x = %d, y = %d", driver->_DecorationWidth, driver->_DecorationHeight);
+				int status = XGetWindowProperty(driver->_dpy, driver->_win, XA_FRAME_EXTENTS, 0, 4, False, XA_CARDINAL, &type_return, &format_return, &nitems_return, &bytes_after_return, (unsigned char**)&data);
+
+				// succeeded to retrieve decoration size
+				if (status == Success && type_return == XA_CARDINAL && format_return == 32 && nitems_return == 4 && data)
+				{
+					driver->_DecorationWidth = data[0];
+					driver->_DecorationHeight = data[2];
+				}
+				else
+				{
+					// use difference between current position and previous one (set by application)
+					driver->_DecorationWidth = e.xconfigure.x - driver->_WindowX;
+					driver->_DecorationHeight = e.xconfigure.y - driver->_WindowY;
+				}
+				
+				// don't allow negative decoration sizes
+				if (driver->_DecorationWidth < 0) driver->_DecorationWidth = 0;
+				if (driver->_DecorationHeight < 0) driver->_DecorationHeight = 0;
 			}
 
 			driver->_CurrentMode.Width = e.xconfigure.width;
 			driver->_CurrentMode.Height = e.xconfigure.height;
 			driver->_WindowX = e.xconfigure.x - driver->_DecorationWidth;
 			driver->_WindowY = e.xconfigure.y - driver->_DecorationHeight;
-
-			XConfigureEvent event = e.xconfigure;
-
-			nlwarning("Configure x = %d, y = %d, width = %d, height = %d, send event = %d", event.x, event.y, event.width, event.height, event.send_event);
 		}
 
 		break;
@@ -401,6 +420,9 @@ bool CDriverGL::init (uint windowIcon, emptyProc exitFunc)
 	XA_WM_STATE = XInternAtom(_dpy, "_NET_WM_STATE", False);
 	XA_WM_STATE_FULLSCREEN = XInternAtom(_dpy, "_NET_WM_STATE_FULLSCREEN", False);
 	XA_WM_ICON = XInternAtom(_dpy, "_NET_WM_ICON", False);
+	XA_WM_WINDOW_TYPE = XInternAtom(_dpy, "_NET_WM_WINDOW_TYPE", False);
+	XA_WM_WINDOW_TYPE_NORMAL = XInternAtom(_dpy, "_NET_WM_WINDOW_TYPE_NORMAL", False);
+	XA_FRAME_EXTENTS = XInternAtom(_dpy, "_NET_FRAME_EXTENTS", False);
 
 #endif
 
@@ -1528,6 +1550,42 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 		return false;
 	}
 
+	// normal window type
+	XChangeProperty(_dpy, window, XA_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (const unsigned char*)&XA_WM_WINDOW_TYPE_NORMAL, 1);
+
+	// set WM hints
+	XWMHints *wm_hints = XAllocWMHints();
+
+	if (wm_hints)
+	{
+		wm_hints->flags = StateHint | InputHint;
+		wm_hints->initial_state = NormalState;
+		wm_hints->input = True;
+
+		XSetWMHints(_dpy, window, wm_hints);
+		XFree(wm_hints);
+	}
+	else
+	{
+		nlwarning("3D: Couldn't allocate XWMHints");
+	}
+
+	// set class hints
+	XClassHint *class_hints = XAllocClassHint();
+
+	if (class_hints)
+	{
+		class_hints->res_name = (char*)"NeL";
+		class_hints->res_class = (char*)"nel";
+
+		XSetClassHint(_dpy, window, class_hints);
+		XFree(class_hints);
+	}
+	else
+	{
+		nlwarning("3D: Couldn't allocate XClassHint");
+	}
+	
 #endif // NL_OS_UNIX
 
 	_win = window;
@@ -2201,11 +2259,19 @@ void CDriverGL::setWindowTitle(const ucstring &title)
 #elif defined (NL_OS_UNIX)
 
 #ifdef X_HAVE_UTF8_STRING
+	// UTF8 properties
 	Xutf8SetWMProperties (_dpy, _win, (char*)title.toUtf8().c_str(), (char*)title.toUtf8().c_str(), NULL, 0, NULL, NULL, NULL);
 #else
+	// standard properties
 	XTextProperty text_property;
-	XStringListToTextProperty((char**)&title.toUtf8().c_str(), 1, &text_property);
+	if (XStringListToTextProperty((char**)&title.toUtf8().c_str(), 1, &text_property) != 0)
-	XSetWMProperties (_dpy, _win, &text_property, &text_property,  0, 0, NULL, 0, 0);
+	{
+		XSetWMProperties (_dpy, _win, &text_property, &text_property,  NULL, 0, NULL, NULL, NULL);
+	}
+	else
+	{
+		nlwarning("3D: Can't convert title to TextProperty");
+	}
 #endif
 
 #endif // NL_OS_WINDOWS

code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin.h

@@ -95,12 +95,6 @@ public:
 	@endcode
 	*/
 	virtual void setNelContext(NLMISC::INelContext *nelContext) = 0;
-
-	virtual QString name() const = 0;
-	virtual QString version() const = 0;
-	virtual QString vendor() const = 0;
-	virtual QString description() const = 0;
-	virtual QStringList dependencies() const = 0;
 };
 
 }; //namespace ExtensionSystem

code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin_spec.h

@@ -37,8 +37,8 @@ struct State
 	{
 		Invalid = 1,
 		Read,
-		Loaded,
 		Resolved,
+		Loaded,
 		Initialized,
 		Running,
 		Stopped,

code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.cpp

@@ -26,13 +26,14 @@
 namespace ExtensionSystem
 {
 
-CPluginManager::CPluginManager(QObject *parent)
+PluginManager::PluginManager(QObject *parent)
 	:IPluginManager(parent),
-	 m_settings(0)
+	 m_settings(0),
+	 m_extension("xml")
 {
 }
 
-CPluginManager::~CPluginManager()
+PluginManager::~PluginManager()
 {
 	writeSettings();
 	stopAll();
@@ -40,7 +41,7 @@ CPluginManager::~CPluginManager()
 	qDeleteAll(m_pluginSpecs);
 }
 
-void CPluginManager::addObject(QObject *obj)
+void PluginManager::addObject(QObject *obj)
 {
 	QWriteLocker lock(&m_lock);
 	if (obj == 0)
@@ -60,7 +61,7 @@ void CPluginManager::addObject(QObject *obj)
 	Q_EMIT objectAdded(obj);
 }
 
-void CPluginManager::removeObject(QObject *obj)
+void PluginManager::removeObject(QObject *obj)
 {
 	if (obj == 0)
 	{
@@ -80,25 +81,25 @@ void CPluginManager::removeObject(QObject *obj)
 	m_allObjects.removeAll(obj);
 }
 
-QList<QObject *> CPluginManager::allObjects() const
+QList<QObject *> PluginManager::allObjects() const
 {
 	return m_allObjects;
 }
 
-void CPluginManager::loadPlugins()
+void PluginManager::loadPlugins()
 {
-	Q_FOREACH (CPluginSpec *spec, m_pluginSpecs)
+	Q_FOREACH (PluginSpec *spec, m_pluginSpecs)
-	setPluginState(spec, State::Loaded);
-
-	Q_FOREACH (CPluginSpec *spec, m_pluginSpecs)
 	setPluginState(spec, State::Resolved);
 
-	QList<CPluginSpec *> queue = loadQueue();
+	QList<PluginSpec *> queue = loadQueue();
 
-	Q_FOREACH (CPluginSpec *spec, queue)
+	Q_FOREACH (PluginSpec *spec, queue)
+	setPluginState(spec, State::Loaded);
+
+	Q_FOREACH (PluginSpec *spec, queue)
 	setPluginState(spec, State::Initialized);
 
-	QListIterator<CPluginSpec *> it(queue);
+	QListIterator<PluginSpec *> it(queue);
 	it.toBack();
 	while (it.hasPrevious())
 		setPluginState(it.previous(), State::Running);
@@ -106,34 +107,34 @@ void CPluginManager::loadPlugins()
 	Q_EMIT pluginsChanged();
 }
 
-QStringList CPluginManager::getPluginPaths() const
+QStringList PluginManager::getPluginPaths() const
 {
 	return m_pluginPaths;
 }
 
-void CPluginManager::setPluginPaths(const QStringList &paths)
+void PluginManager::setPluginPaths(const QStringList &paths)
 {
 	m_pluginPaths = paths;
 	readPluginPaths();
 	readSettings();
 }
 
-QList<IPluginSpec *> CPluginManager::plugins() const
+QList<IPluginSpec *> PluginManager::plugins() const
 {
 	return m_ipluginSpecs;
 }
 
-void CPluginManager::setSettings(QSettings *settings)
+void PluginManager::setSettings(QSettings *settings)
 {
 	m_settings = settings;
 }
 
-QSettings *CPluginManager::settings() const
+QSettings *PluginManager::settings() const
 {
 	return m_settings;
 }
 
-void CPluginManager::readSettings()
+void PluginManager::readSettings()
 {
 	if (m_settings)
 	{
@@ -141,7 +142,7 @@ void CPluginManager::readSettings()
 		m_settings->beginGroup("PluginManager");
 		blackList = m_settings->value("BlackList").toStringList();
 		m_settings->endGroup();
-		Q_FOREACH (CPluginSpec *spec, m_pluginSpecs)
+		Q_FOREACH (PluginSpec *spec, m_pluginSpecs)
 		{
 			QString pluginName = spec->fileName();
 
@@ -154,14 +155,13 @@ void CPluginManager::readSettings()
 	}
 }
 
-void CPluginManager::writeSettings()
+void PluginManager::writeSettings()
 {
 	if (m_settings)
 	{
 		QStringList blackList;
-		Q_FOREACH(CPluginSpec *spec, m_pluginSpecs)
+		Q_FOREACH(PluginSpec *spec, m_pluginSpecs)
 		{
-			nlinfo(spec->fileName().toStdString().c_str());
 			if (!spec->isEnabled())
 				blackList.push_back(spec->fileName());
 		}
@@ -172,7 +172,7 @@ void CPluginManager::writeSettings()
 	}
 }
 
-void CPluginManager::readPluginPaths()
+void PluginManager::readPluginPaths()
 {
 	qDeleteAll(m_pluginSpecs);
 	m_pluginSpecs.clear();
@@ -183,11 +183,7 @@ void CPluginManager::readPluginPaths()
 	while (!searchPaths.isEmpty())
 	{
 		const QDir dir(searchPaths.takeFirst());
-#ifdef Q_OS_WIN
+		const QFileInfoList files = dir.entryInfoList(QStringList() << QString("ovqt_plugin_*.%1").arg(m_extension), QDir::Files);
-		const QFileInfoList files = dir.entryInfoList(QStringList() << QString("ovqt_plugin_*.dll"), QDir::Files);
-#else
-		const QFileInfoList files = dir.entryInfoList(QStringList() << QString("libovqt_plugin_*.so"), QDir::Files);
-#endif
 		Q_FOREACH (const QFileInfo &file, files)
 		pluginsList << file.absoluteFilePath();
 		const QFileInfoList dirs = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot);
@@ -197,9 +193,9 @@ void CPluginManager::readPluginPaths()
 
 	Q_FOREACH (const QString &pluginFile, pluginsList)
 	{
-		CPluginSpec *spec = new CPluginSpec;
+		PluginSpec *spec = new PluginSpec;
-		spec->setFileName(pluginFile);
 		spec->m_pluginManager = this;
+		spec->setSpecFileName(pluginFile);
 		m_pluginSpecs.append(spec);
 		m_ipluginSpecs.append(spec);
 	}
@@ -207,7 +203,7 @@ void CPluginManager::readPluginPaths()
 	Q_EMIT pluginsChanged();
 }
 
-void CPluginManager::setPluginState(CPluginSpec *spec, int destState)
+void PluginManager::setPluginState(PluginSpec *spec, int destState)
 {
 	if (spec->hasError() || spec->state() != destState-1)
 		return;
@@ -218,9 +214,6 @@ void CPluginManager::setPluginState(CPluginSpec *spec, int destState)
 
 	switch (destState)
 	{
-	case State::Loaded:
-		spec->loadLibrary();
-		return;
 	case State::Resolved:
 		spec->resolveDependencies(m_pluginSpecs);
 		return;
@@ -233,18 +226,21 @@ void CPluginManager::setPluginState(CPluginSpec *spec, int destState)
 	default:
 		break;
 	}
-	Q_FOREACH (const CPluginSpec *depSpec, spec->dependencySpecs())
+	Q_FOREACH (const PluginSpec *depSpec, spec->dependencySpecs())
 	{
 		if (depSpec->state() != destState)
 		{
 			spec->m_hasError = true;
-			spec->m_errorString = tr("Cannot initializing plugin because dependency failed to load: %1\nReason: %2")
+			spec->m_errorString = tr("Cannot load plugin because dependency failed to load: %1")
-								  .arg(depSpec->name()).arg(depSpec->errorString());
+								  .arg(depSpec->name());
 			return;
 		}
 	}
 	switch (destState)
 	{
+	case State::Loaded:
+		spec->loadLibrary();
+		return;
 	case State::Initialized:
 		spec->initializePlugin();
 		break;
@@ -256,19 +252,19 @@ void CPluginManager::setPluginState(CPluginSpec *spec, int destState)
 	}
 }
 
-QList<CPluginSpec *> CPluginManager::loadQueue()
+QList<PluginSpec *> PluginManager::loadQueue()
 {
-	QList<CPluginSpec *> queue;
+	QList<PluginSpec *> queue;
-	Q_FOREACH(CPluginSpec *spec, m_pluginSpecs)
+	Q_FOREACH(PluginSpec *spec, m_pluginSpecs)
 	{
-		QList<CPluginSpec *> circularityCheckQueue;
+		QList<PluginSpec *> circularityCheckQueue;
 		loadQueue(spec, queue, circularityCheckQueue);
 	}
 	return queue;
 }
 
-bool CPluginManager::loadQueue(CPluginSpec *spec, QList<CPluginSpec *> &queue,
+bool PluginManager::loadQueue(PluginSpec *spec, QList<PluginSpec *> &queue,
-							   QList<CPluginSpec *> &circularityCheckQueue)
+							  QList<PluginSpec *> &circularityCheckQueue)
 {
 	if (queue.contains(spec))
 		return true;
@@ -295,7 +291,7 @@ bool CPluginManager::loadQueue(CPluginSpec *spec, QList<CPluginSpec *> &queue,
 	}
 
 	// add dependencies
-	Q_FOREACH (CPluginSpec *depSpec, spec->dependencySpecs())
+	Q_FOREACH (PluginSpec *depSpec, spec->dependencySpecs())
 	{
 		if (!loadQueue(depSpec, queue, circularityCheckQueue))
 		{
@@ -311,17 +307,17 @@ bool CPluginManager::loadQueue(CPluginSpec *spec, QList<CPluginSpec *> &queue,
 	return true;
 }
 
-void CPluginManager::stopAll()
+void PluginManager::stopAll()
 {
-	QList<CPluginSpec *> queue = loadQueue();
+	QList<PluginSpec *> queue = loadQueue();
-	Q_FOREACH (CPluginSpec *spec, queue)
+	Q_FOREACH (PluginSpec *spec, queue)
 	setPluginState(spec, State::Stopped);
 }
 
-void CPluginManager::deleteAll()
+void PluginManager::deleteAll()
 {
-	QList<CPluginSpec *> queue = loadQueue();
+	QList<PluginSpec *> queue = loadQueue();
-	QListIterator<CPluginSpec *> it(queue);
+	QListIterator<PluginSpec *> it(queue);
 	it.toBack();
 	while (it.hasPrevious())
 	{

code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.h

@@ -29,15 +29,15 @@ namespace ExtensionSystem
 {
 
 class IPlugin;
-class CPluginSpec;
+class PluginSpec;
 
-class CPluginManager : public IPluginManager
+class PluginManager : public IPluginManager
 {
 	Q_OBJECT
 
 public:
-	CPluginManager(QObject *parent = 0);
+	PluginManager(QObject *parent = 0);
-	~CPluginManager();
+	~PluginManager();
 
 	// Object pool operations
 	virtual void addObject(QObject *obj);
@@ -49,7 +49,7 @@ public:
 	virtual QStringList getPluginPaths() const;
 	virtual void setPluginPaths(const QStringList &paths);
 	virtual QList<IPluginSpec *> plugins() const;
-	QList<CPluginSpec *> loadQueue();
+	QList<PluginSpec *> loadQueue();
 
 	// Settings
 	virtual void setSettings(QSettings *settings);
@@ -58,21 +58,22 @@ public:
 	void writeSettings();
 
 private:
-	void setPluginState(CPluginSpec *spec, int destState);
+	void setPluginState(PluginSpec *spec, int destState);
 	void readPluginPaths();
-	bool loadQueue(CPluginSpec *spec, QList<CPluginSpec *> &queue, QList<CPluginSpec *> &circularityCheckQueue);
+	bool loadQueue(PluginSpec *spec, QList<PluginSpec *> &queue, QList<PluginSpec *> &circularityCheckQueue);
 	void stopAll();
 	void deleteAll();
 
 	mutable QReadWriteLock m_lock;
 
 	QSettings *m_settings;
-	QList<CPluginSpec *> m_pluginSpecs;
+	QString m_extension;
+	QList<PluginSpec *> m_pluginSpecs;
 	QList<IPluginSpec *> m_ipluginSpecs;
 	QStringList m_pluginPaths;
 	QList<QObject *> m_allObjects;
 
-}; // class CPluginManager
+}; // class PluginManager
 
 } // namespace ExtensionSystem
 

code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp

@@ -16,12 +16,15 @@
 // 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 "plugin_spec.h"
 #include "iplugin.h"
 #include "iplugin_manager.h"
 
 #include "nel/misc/app_context.h"
+#include "nel/misc/debug.h"
 
+// Qt includes
 #include <QtCore/QList>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
@@ -30,8 +33,17 @@
 
 namespace ExtensionSystem
 {
+const char *const PLUGIN_SPEC_NAME = "name";
+const char *const PLUGIN_SPEC_VENDOR = "vendor";
+const char *const PLUGIN_SPEC_VERSION = "version";
+const char *const PLUGIN_SPEC_LIBRARY_NAME = "library-name";
+const char *const PLUGIN_SPEC_DESCRIPTION = "description";
+const char *const PLUGIN_SPEC_DEPENDENCIES = "dependencies";
+const char *const PLUGIN_SPEC_DEPENDENCY = "dependency";
+const char *const PLUGIN_SPEC_DEPENDENCY_NAME = "plugin-name";
+const char *const PLUGIN_SPEC_DEPENDENCY_VERSION = "version";
 
-CPluginSpec::CPluginSpec()
+PluginSpec::PluginSpec()
 	: m_location(""),
 	  m_filePath(""),
 	  m_fileName(""),
@@ -39,6 +51,8 @@ CPluginSpec::CPluginSpec()
 	  m_version(""),
 	  m_vendor(""),
 	  m_description(""),
+	  m_nameSpecFile(""),
+	  m_suffix(""),
 	  m_state(State::Invalid),
 	  m_enabled(true),
 	  m_enabledStartup(true),
@@ -47,104 +61,195 @@ CPluginSpec::CPluginSpec()
 	  m_plugin(0),
 	  m_pluginManager(0)
 {
+#ifdef Q_OS_WIN
+#	ifdef DEBUG
+	m_suffix = "_d.dll";
+#	else
+	m_suffix = "_r.dll";
+#	endif
+#else
+	m_suffix = ".so";
+#endif
 }
 
-QString CPluginSpec::name() const
+QString PluginSpec::name() const
 {
 	return m_name;
 }
 
-QString CPluginSpec::version() const
+QString PluginSpec::version() const
 {
 	return m_version;
 }
 
-QString CPluginSpec::vendor() const
+QString PluginSpec::vendor() const
 {
 	return m_vendor;
 }
 
-QString CPluginSpec::description() const
+QString PluginSpec::description() const
 {
 	return m_description;
 }
 
-QString CPluginSpec::location() const
+QString PluginSpec::location() const
 {
 	return m_location;
 }
 
-QString CPluginSpec::filePath() const
+QString PluginSpec::filePath() const
 {
 	return m_filePath;
 }
 
-QString CPluginSpec::fileName() const
+QString PluginSpec::fileName() const
 {
 	return m_fileName;
 }
 
-IPlugin *CPluginSpec::plugin() const
+IPlugin *PluginSpec::plugin() const
 {
 	return m_plugin;
 }
 
-int CPluginSpec::state() const
+int PluginSpec::state() const
 {
 	return m_state;
 }
 
-bool CPluginSpec::hasError() const
+bool PluginSpec::hasError() const
 {
 	return m_hasError;
 }
 
-QString CPluginSpec::errorString() const
+QString PluginSpec::errorString() const
 {
 	return m_errorString;
 }
 
-QList<CPluginSpec *> CPluginSpec::dependencySpecs() const
+QList<PluginSpec *> PluginSpec::dependencySpecs() const
 {
 	return m_dependencySpecs;
 }
 
-bool CPluginSpec::setFileName(const QString &fileName)
+bool PluginSpec::setFileName(const QString &fileName)
 {
-	QFile file(fileName);
+	m_fileName = fileName + m_suffix;
+	m_filePath = m_location + "/" + m_fileName;
+
+	nlinfo(m_filePath.toStdString().c_str());
+	QFile file(m_filePath);
 	if (!file.exists())
-		return reportError(QCoreApplication::translate("CPluginSpec", "File does not exist: %1").arg(file.fileName()));
+		return reportError(QCoreApplication::translate("PluginSpec", "File does not exist: %1").arg(file.fileName()));
 	if (!file.open(QIODevice::ReadOnly))
-		return reportError(QCoreApplication::translate("CPluginSpec", "Could not open file for read: %1").arg(file.fileName()));
+		return reportError(QCoreApplication::translate("PluginSpec", "Could not open file for read: %1").arg(file.fileName()));
+	return true;
+}
+
+bool PluginSpec::setSpecFileName(const QString &specFileName)
+{
+	m_nameSpecFile = specFileName;
+
+	QFile file(specFileName);
+	if (!file.exists())
+		return reportError(QCoreApplication::translate("PluginSpec", "Spec file does not exist: %1").arg(file.fileName()));
 
 	QFileInfo fileInfo(file);
 	m_location = fileInfo.absolutePath();
-	m_filePath = fileInfo.absoluteFilePath();
+	readSpec();
-	m_fileName = fileInfo.fileName();
+	return true;
+}
 
+bool PluginSpec::readSpec()
+{
+	QFile file(m_nameSpecFile);
+	if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+		return reportError(QCoreApplication::translate("PluginSpec", "Could not open spec file for read: %1").arg(file.fileName()));
+
+	QXmlStreamReader reader(&file);
+	while (!reader.atEnd())
+	{
+		if (reader.isStartElement())
+			parseSpec(reader);
+		reader.readNext();
+	}
+	if (reader.hasError())
+		return reportError(QCoreApplication::translate("PluginSpec", "Error parsing file %1: %2, at line %3, column %4")
+						   .arg(file.fileName())
+						   .arg(reader.errorString())
+						   .arg(reader.lineNumber())
+						   .arg(reader.columnNumber()));
 	m_state = State::Read;
 	return true;
 }
 
-void CPluginSpec::setEnabled(bool enabled)
+void PluginSpec::parseSpec(QXmlStreamReader &reader)
+{
+	QString elemName = reader.name().toString();
+	reader.readNext();
+	if (reader.isCharacters())
+	{
+		QString elemText = reader.text().toString();
+		if (elemName == PLUGIN_SPEC_LIBRARY_NAME)
+			setFileName(elemText);
+		if (elemName == PLUGIN_SPEC_NAME)
+			m_name = elemText;
+		if (elemName == PLUGIN_SPEC_VERSION)
+			m_version = elemText;
+		if (elemName == PLUGIN_SPEC_VENDOR)
+			m_vendor = elemText;
+		if (elemName == PLUGIN_SPEC_DESCRIPTION)
+			m_description = elemText;
+		if (elemName == PLUGIN_SPEC_DEPENDENCIES)
+			parseDependency(reader);
+	}
+}
+
+void PluginSpec::parseDependency(QXmlStreamReader &reader)
+{
+	QString elemName;
+	while (!reader.atEnd() && (elemName != PLUGIN_SPEC_DEPENDENCIES))
+	{
+		reader.readNext();
+		elemName = reader.name().toString();
+		if (reader.isStartElement() && (elemName == PLUGIN_SPEC_DEPENDENCY))
+		{
+			// Read name dependency plugin
+			QString dependencyName = reader.attributes().value(PLUGIN_SPEC_DEPENDENCY_NAME).toString();
+			if (dependencyName.isEmpty())
+			{
+				reader.raiseError(QCoreApplication::translate("CPluginSpec", "'%1' misses attribute '%2'")
+								  .arg(PLUGIN_SPEC_DEPENDENCY)
+								  .arg(PLUGIN_SPEC_DEPENDENCY_NAME));
+				return;
+			}
+			// TODO: Read version dependency plugin
+			QString dependencyVersion = reader.attributes().value(PLUGIN_SPEC_DEPENDENCY_VERSION).toString();
+
+			m_dependencies.push_back(dependencyName);
+		}
+	}
+}
+
+void PluginSpec::setEnabled(bool enabled)
 {
 	m_enabled = enabled;
 }
 
-bool CPluginSpec::isEnabled() const
+bool PluginSpec::isEnabled() const
 {
 	return m_enabled;
 }
 
-bool CPluginSpec::loadLibrary()
+bool PluginSpec::loadLibrary()
 {
 	if (m_hasError)
 		return false;
-	if (m_state != State::Read)
+	if (m_state != State::Resolved)
 	{
 		if (m_state == State::Loaded)
 			return true;
-		return reportError(QCoreApplication::translate("CPluginSpec", "Loading the library failed because state != Resolved"));
+		return reportError(QCoreApplication::translate("PluginSpec", "Loading the library failed because state != Resolved"));
 	}
 
 	QPluginLoader loader(m_filePath);
@@ -155,38 +260,32 @@ bool CPluginSpec::loadLibrary()
 	if (!pluginObject)
 	{
 		loader.unload();
-		return reportError(QCoreApplication::translate("CPluginSpec", "Plugin is not valid (does not derive from IPlugin)"));
+		return reportError(QCoreApplication::translate("PluginSpec", "Plugin is not valid (does not derive from IPlugin)"));
 	}
 
 	pluginObject->setNelContext(&NLMISC::INelContext::getInstance());
 
-	m_name = pluginObject->name();
-	m_version = pluginObject->version();
-	m_vendor = pluginObject->vendor();
-	m_description = pluginObject->description();
-
 	m_state = State::Loaded;
 	m_plugin = pluginObject;
 	return true;
 }
 
-bool CPluginSpec::resolveDependencies(const QList<CPluginSpec *> &specs)
+bool PluginSpec::resolveDependencies(const QList<PluginSpec *> &specs)
 {
 	if (m_hasError)
 		return false;
-	if (m_state != State::Loaded)
+	if (m_state != State::Read)
 	{
-		m_errorString = QCoreApplication::translate("CPluginSpec", "Resolving dependencies failed because state != Read");
+		m_errorString = QCoreApplication::translate("PluginSpec", "Resolving dependencies failed because state != Read");
 		m_hasError = true;
 		return false;
 	}
-	QList<CPluginSpec *> resolvedDependencies;
+	QList<PluginSpec *> resolvedDependencies;
-	QStringList dependencies = m_plugin->dependencies();
+	Q_FOREACH(const QString &dependency, m_dependencies)
-	Q_FOREACH(const QString &dependency, dependencies)
 	{
-		CPluginSpec *found = 0;
+		PluginSpec *found = 0;
 
-		Q_FOREACH(CPluginSpec *spec, specs)
+		Q_FOREACH(PluginSpec *spec, specs)
 		{
 			if (QString::compare(dependency, spec->name(), Qt::CaseInsensitive) == 0)
 			{
@@ -199,7 +298,7 @@ bool CPluginSpec::resolveDependencies(const QList<CPluginSpec *> &specs)
 			m_hasError = true;
 			if (!m_errorString.isEmpty())
 				m_errorString.append(QLatin1Char('\n'));
-			m_errorString.append(QCoreApplication::translate("CPluginSpec", "Could not resolve dependency '%1'")
+			m_errorString.append(QCoreApplication::translate("PluginSpec", "Could not resolve dependency '%1'")
 								 .arg(dependency));
 			continue;
 		}
@@ -209,34 +308,32 @@ bool CPluginSpec::resolveDependencies(const QList<CPluginSpec *> &specs)
 		return false;
 
 	m_dependencySpecs = resolvedDependencies;
-
 	m_state = State::Resolved;
-
 	return true;
 }
 
-bool CPluginSpec::initializePlugin()
+bool PluginSpec::initializePlugin()
 {
 	if (m_hasError)
 		return false;
-	if (m_state != State::Resolved)
+	if (m_state != State::Loaded)
 	{
 		if (m_state == State::Initialized)
 			return true;
-		return reportError(QCoreApplication::translate("CPluginSpec", "Initializing the plugin failed because state != Resolved)"));
+		return reportError(QCoreApplication::translate("PluginSpec", "Initializing the plugin failed because state != Loaded)"));
 	}
 	if (!m_plugin)
-		return reportError(QCoreApplication::translate("CPluginSpec", "Internal error: have no plugin instance to initialize"));
+		return reportError(QCoreApplication::translate("PluginSpec", "Internal error: have no plugin instance to initialize"));
 
 	QString err;
 	if (!m_plugin->initialize(m_pluginManager, &err))
-		return reportError(QCoreApplication::translate("CPluginSpec", "Plugin initialization failed: %1").arg(err));
+		return reportError(QCoreApplication::translate("PluginSpec", "Plugin initialization failed: %1").arg(err));
 
 	m_state = State::Initialized;
 	return true;
 }
 
-bool CPluginSpec::initializeExtensions()
+bool PluginSpec::initializeExtensions()
 {
 	if (m_hasError)
 		return false;
@@ -244,17 +341,17 @@ bool CPluginSpec::initializeExtensions()
 	{
 		if (m_state == State::Running)
 			return true;
-		return reportError(QCoreApplication::translate("CPluginSpec", "Cannot perform extensionsInitialized because state != Initialized"));
+		return reportError(QCoreApplication::translate("PluginSpec", "Cannot perform extensionsInitialized because state != Initialized"));
 	}
 	if (!m_plugin)
-		return reportError(QCoreApplication::translate("CPluginSpec", "Internal error: have no plugin instance to perform extensionsInitialized"));
+		return reportError(QCoreApplication::translate("PluginSpec", "Internal error: have no plugin instance to perform extensionsInitialized"));
 
 	m_plugin->extensionsInitialized();
 	m_state = State::Running;
 	return true;
 }
 
-void CPluginSpec::stop()
+void PluginSpec::stop()
 {
 	if (!m_plugin)
 		return;
@@ -262,7 +359,7 @@ void CPluginSpec::stop()
 	m_state = State::Stopped;
 }
 
-void CPluginSpec::kill()
+void PluginSpec::kill()
 {
 	if (!m_plugin)
 		return;
@@ -271,17 +368,17 @@ void CPluginSpec::kill()
 	m_state = State::Deleted;
 }
 
-void CPluginSpec::setEnabledStartup(bool enabled)
+void PluginSpec::setEnabledStartup(bool enabled)
 {
 	m_enabledStartup = enabled;
 }
 
-bool CPluginSpec::isEnabledStartup() const
+bool PluginSpec::isEnabledStartup() const
 {
 	return m_enabledStartup;
 }
 
-bool CPluginSpec::reportError(const QString &err)
+bool PluginSpec::reportError(const QString &err)
 {
 	m_errorString = err;
 	m_hasError = true;

code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.h

@@ -21,12 +21,14 @@
 
 #include "iplugin_spec.h"
 
-#include "QtCore/QList"
+#include <QtCore/QList>
+#include <QtCore/QStringList>
+#include <QtCore/QXmlStreamReader>
 
 namespace ExtensionSystem
 {
 
-class CPluginSpec: public IPluginSpec
+class PluginSpec: public IPluginSpec
 {
 public:
 	virtual QString name() const;
@@ -44,18 +46,22 @@ public:
 	virtual int state() const;
 	virtual bool hasError() const;
 	virtual QString errorString() const;
-	QList<CPluginSpec *> dependencySpecs() const;
+	QList<PluginSpec *> dependencySpecs() const;
 
 	/// Enables/disables load this plugin after restart the program
 	virtual void setEnabled(bool enabled);
 	virtual bool isEnabled() const;
 
 private:
-	CPluginSpec();
+	PluginSpec();
 
 	bool setFileName(const QString &fileName);
+	bool setSpecFileName(const QString &specFileName);
+	bool readSpec();
+	void parseSpec(QXmlStreamReader &reader);
+	void parseDependency(QXmlStreamReader &reader);
 	bool loadLibrary();
-	bool resolveDependencies(const QList<CPluginSpec *> &specs);
+	bool resolveDependencies(const QList<PluginSpec *> &specs);
 	bool initializePlugin();
 	bool initializeExtensions();
 	void stop();
@@ -77,16 +83,19 @@ private:
 	QString m_vendor;
 	QString m_description;
 
+	QString m_nameSpecFile;
+	QString m_suffix;
 	int m_state;
 	bool m_enabled, m_enabledStartup;
 	bool m_hasError;
 	QString m_errorString;
+	QStringList m_dependencies;
 
 	IPlugin *m_plugin;
 	IPluginManager *m_pluginManager;
-	QList<CPluginSpec *> m_dependencySpecs;
+	QList<PluginSpec *> m_dependencySpecs;
 
-	friend class CPluginManager;
+	friend class PluginManager;
 };
 
 } // namespace ExtensionSystem

code/nel/tools/3d/object_viewer_qt/src/main.cpp

@@ -148,7 +148,7 @@ sint main(int argc, char **argv)
 	NLMISC::CLibrary::addLibPath((qApp->applicationDirPath() + QString("/../PlugIns/nel")).toStdString());
 #endif
 
-	ExtensionSystem::CPluginManager pluginManager;
+	ExtensionSystem::PluginManager pluginManager;
 	pluginManager.setSettings(settings);
 	QStringList pluginPaths;
 #if !defined(NL_OS_MAC)

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

@@ -11,7 +11,6 @@ SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.
 SET(OVQT_CORE_PLUGIN_HDR
 				icore.h
 				icontext.h
-				imenu_manager.h
 				icore_listener.h
 				ioptions_page.h
 				core_plugin.h

code/nel/tools/3d/object_viewer_qt/src/plugins/core/core.cpp

@@ -17,7 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "core.h"
-#include "imenu_manager.h"
 #include "context_manager.h"
 #include "main_window.h"
 #include "../../extension_system/iplugin_manager.h"
@@ -50,7 +49,7 @@ bool CoreImpl::showOptionsDialog(const QString &group,
 	return m_mainWindow->showOptionsDialog(group, page, parent);
 }
 
-IMenuManager *CoreImpl::menuManager() const
+MenuManager *CoreImpl::menuManager() const
 {
 	return m_mainWindow->menuManager();
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/core/core.h

@@ -30,14 +30,14 @@ class CoreImpl : public ICore
 	Q_OBJECT
 
 public:
-	CoreImpl(MainWindow *mainWindow);
+	explicit CoreImpl(MainWindow *mainWindow);
 	virtual ~CoreImpl();
 
 	virtual bool showOptionsDialog(const QString &group = QString(),
 								   const QString &page = QString(),
 								   QWidget *parent = 0);
 
-	virtual IMenuManager *menuManager() const;
+	virtual MenuManager *menuManager() const;
 	virtual ContextManager *contextManager() const;
 
 	virtual QSettings *settings() const;

code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h

@@ -23,97 +23,97 @@ namespace Core
 namespace Constants
 {
 
-const char * const OVQT_VERSION_LONG = "0.1";
+const char *const OVQT_VERSION_LONG = "0.8";
-const char * const OVQT_VENDOR = "Ryzom Core";
+const char *const OVQT_VENDOR = "Ryzom Core";
-const char * const OVQT_YEAR = "2010, 2011";
+const char *const OVQT_YEAR = "2010, 2011";
-const char * const OVQT_CORE_PLUGIN = "Core";
+const char *const OVQT_CORE_PLUGIN = "Core";
 
 //mainwindow
-const char * const MAIN_WINDOW = "ObjectViewerQt.MainWindow";
+const char *const MAIN_WINDOW = "ObjectViewerQt.MainWindow";
 
 //menubar
-const char * const MENU_BAR = "ObjectViewerQt.MenuBar";
+const char *const MENU_BAR = "ObjectViewerQt.MenuBar";
 
 //menus
-const char * const M_FILE = "ObjectViewerQt.Menu.File";
+const char *const M_FILE = "ObjectViewerQt.Menu.File";
-const char * const M_EDIT = "ObjectViewerQt.Menu.Edit";
+const char *const M_EDIT = "ObjectViewerQt.Menu.Edit";
-const char * const M_VIEW = "ObjectViewerQt.Menu.View";
+const char *const M_VIEW = "ObjectViewerQt.Menu.View";
-const char * const M_SCENE = "ObjectViewerQt.Menu.Scene";
+const char *const M_SCENE = "ObjectViewerQt.Menu.Scene";
-const char * const M_TOOLS = "ObjectViewerQt.Menu.Tools";
+const char *const M_TOOLS = "ObjectViewerQt.Menu.Tools";
-const char * const M_WINDOW = "ObjectViewerQt.Menu.Window";
+const char *const M_WINDOW = "ObjectViewerQt.Menu.Window";
-const char * const M_HELP = "ObjectViewerQt.Menu.Help";
+const char *const M_HELP = "ObjectViewerQt.Menu.Help";
 
-const char * const M_FILE_RECENTFILES = "ObjectViewerQt.Menu.File.RecentFiles";
+const char *const M_FILE_RECENTFILES = "ObjectViewerQt.Menu.File.RecentFiles";
-const char * const M_SHEET = "ObjectViewerQt.Menu.Sheet";
+const char *const M_SHEET = "ObjectViewerQt.Menu.Sheet";
 
 //actions
-const char * const NEW = "ObjectViewerQt.New";
+const char *const NEW = "ObjectViewerQt.New";
-const char * const OPEN = "ObjectViewerQt.Open";
+const char *const OPEN = "ObjectViewerQt.Open";
-const char * const SAVE = "ObjectViewerQt.Save";
+const char *const SAVE = "ObjectViewerQt.Save";
-const char * const SAVE_AS = "ObjectViewerQt.SaveAs";
+const char *const SAVE_AS = "ObjectViewerQt.SaveAs";
-const char * const SAVE_ALL = "ObjectViewerQt.SaveAll";
+const char *const SAVE_ALL = "ObjectViewerQt.SaveAll";
-const char * const EXIT = "ObjectViewerQt.Exit";
+const char *const EXIT = "ObjectViewerQt.Exit";
 
-const char * const UNDO = "ObjectViewerQt.Undo";
+const char *const UNDO = "ObjectViewerQt.Undo";
-const char * const REDO = "ObjectViewerQt.Redo";
+const char *const REDO = "ObjectViewerQt.Redo";
-const char * const CUT = "ObjectViewerQt.Cut";
+const char *const CUT = "ObjectViewerQt.Cut";
-const char * const COPY = "ObjectViewerQt.Copy";
+const char *const COPY = "ObjectViewerQt.Copy";
-const char * const PASTE = "ObjectViewerQt.Paste";
+const char *const PASTE = "ObjectViewerQt.Paste";
-const char * const DEL = "ObjectViewerQt.Del";
+const char *const DEL = "ObjectViewerQt.Del";
-const char * const FIND = "ObjectViewerQt.Find";
+const char *const FIND = "ObjectViewerQt.Find";
-const char * const SELECT_ALL = "ObjectViewerQt.SelectAll";
+const char *const SELECT_ALL = "ObjectViewerQt.SelectAll";
-const char * const GOTO_POS = "ObjectViewerQt.Goto";
+const char *const GOTO_POS = "ObjectViewerQt.Goto";
 
-const char * const SETTINGS = "ObjectViewerQt.Settings";
+const char *const SETTINGS = "ObjectViewerQt.Settings";
-const char * const TOGGLE_FULLSCREEN = "ObjectViewerQt.ToggleFullScreen";
+const char *const TOGGLE_FULLSCREEN = "ObjectViewerQt.ToggleFullScreen";
 
-const char * const CLOSE = "ObjectViewerQt.Close";
+const char *const CLOSE = "ObjectViewerQt.Close";
-const char * const CLOSEALL = "ObjectViewerQt.CloseAll";
+const char *const CLOSEALL = "ObjectViewerQt.CloseAll";
-const char * const CLOSEOTHERS = "ObjectViewerQt.CloseOthers";
+const char *const CLOSEOTHERS = "ObjectViewerQt.CloseOthers";
-const char * const ABOUT = "ObjectViewerQt.About";
+const char *const ABOUT = "ObjectViewerQt.About";
-const char * const ABOUT_PLUGINS = "ObjectViewerQt.AboutPlugins";
+const char *const ABOUT_PLUGINS = "ObjectViewerQt.AboutPlugins";
-const char * const ABOUT_QT = "ObjectViewerQt.AboutQt";
+const char *const ABOUT_QT = "ObjectViewerQt.AboutQt";
 
 //settings
-const char * const SETTINGS_CATEGORY_GENERAL = "general";
+const char *const SETTINGS_CATEGORY_GENERAL = "general";
-const char * const SETTINGS_CATEGORY_GENERAL_ICON = ":/icons/ic_nel_generic_settings.png";
+const char *const SETTINGS_CATEGORY_GENERAL_ICON = ":/icons/ic_nel_generic_settings.png";
-const char * const SETTINGS_TR_CATEGORY_GENERAL = QT_TR_NOOP("General");
+const char *const SETTINGS_TR_CATEGORY_GENERAL = QT_TR_NOOP("General");
 
-const char * const MAIN_WINDOW_SECTION = "MainWindow";
+const char *const MAIN_WINDOW_SECTION = "MainWindow";
-const char * const MAIN_WINDOW_STATE = "WindowState";
+const char *const MAIN_WINDOW_STATE = "WindowState";
-const char * const MAIN_WINDOW_GEOMETRY = "WindowGeometry";
+const char *const MAIN_WINDOW_GEOMETRY = "WindowGeometry";
-const char * const QT_STYLE = "QtStyle";
+const char *const QT_STYLE = "QtStyle";
-const char * const QT_PALETTE = "QtPalette";
+const char *const QT_PALETTE = "QtPalette";
 
-const char * const LANGUAGE = "Language";
+const char *const LANGUAGE = "Language";
-const char * const PLUGINS_PATH = "PluginPath";
+const char *const PLUGINS_PATH = "PluginPath";
-const char * const DATA_PATH_SECTION = "DataPath";
+const char *const DATA_PATH_SECTION = "DataPath";
-const char * const SEARCH_PATHS = "SearchPaths";
+const char *const SEARCH_PATHS = "SearchPaths";
-const char * const RECURSIVE_SEARCH_PATHS = "RecursiveSearchPathes";
+const char *const RECURSIVE_SEARCH_PATHS = "RecursiveSearchPathes";
-const char * const LEVELDESIGN_PATH = "LevelDesignPath";
+const char *const LEVELDESIGN_PATH = "LevelDesignPath";
-const char * const PRIMITIVES_PATH = "PrimitivesPath";
+const char *const PRIMITIVES_PATH = "PrimitivesPath";
 const char * const ASSETS_PATH = "AssetsPath";
-const char * const LIGOCONFIG_FILE = "LigoConfigFile";
+const char *const LIGOCONFIG_FILE = "LigoConfigFile";
-const char * const REMAP_EXTENSIONS = "RemapExtensions";
+const char *const REMAP_EXTENSIONS = "RemapExtensions";
 
-const char * const LOG_SECTION = "LogSettings";
+const char *const LOG_SECTION = "LogSettings";
-const char * const LOG_ERROR   = "LogError";
+const char *const LOG_ERROR   = "LogError";
-const char * const LOG_WARNING = "LogWarning";
+const char *const LOG_WARNING = "LogWarning";
-const char * const LOG_DEBUG   = "LogDebug";
+const char *const LOG_DEBUG   = "LogDebug";
-const char * const LOG_ASSERT  = "LogAssert";
+const char *const LOG_ASSERT  = "LogAssert";
-const char * const LOG_INFO    = "LogInfo";
+const char *const LOG_INFO    = "LogInfo";
 
 //resources
-const char * const ICON_NEL = ":/core/images/nel.png";
+const char *const ICON_NEL = ":/core/images/nel.png";
-const char * const ICON_SETTINGS = ":/core/images/preferences.png";
+const char *const ICON_SETTINGS = ":/core/images/preferences.png";
-const char * const ICON_PILL = ":/core/icons/ic_nel_pill.png";
+const char *const ICON_PILL = ":/core/icons/ic_nel_pill.png";
-const char * const ICON_OPEN = ":/core/icons/ic_nel_open.png";
+const char *const ICON_OPEN = ":/core/icons/ic_nel_open.png";
-const char * const ICON_NEW = ":/core/icons/ic_nel_new.png";
+const char *const ICON_NEW = ":/core/icons/ic_nel_new.png";
-const char * const ICON_SAVE = ":/core/icons/ic_nel_save.png";
+const char *const ICON_SAVE = ":/core/icons/ic_nel_save.png";
-const char * const ICON_SAVE_AS = ":/core/icons/ic_nel_save_as.png";
+const char *const ICON_SAVE_AS = ":/core/icons/ic_nel_save_as.png";
-const char * const ICON_CRASH = ":/core/icons/ic_nel_crash.png";
+const char *const ICON_CRASH = ":/core/icons/ic_nel_crash.png";
-const char * const ICON_UNDO = ":/core/icons/ic_nel_undo.png";
+const char *const ICON_UNDO = ":/core/icons/ic_nel_undo.png";
-const char * const ICON_REDO = ":/core/icons/ic_nel_redo.png";
+const char *const ICON_REDO = ":/core/icons/ic_nel_redo.png";
 
 } // namespace Constants
 } // namespace Core

code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp

@@ -64,8 +64,8 @@ bool CorePlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStr
 	bool success = m_mainWindow->initialize(errorString);
 
 	GeneralSettingsPage *generalSettings = new GeneralSettingsPage(this);
-	CSearchPathsSettingsPage *searchPathPage = new CSearchPathsSettingsPage(false, this);
+	SearchPathsSettingsPage *searchPathPage = new SearchPathsSettingsPage(false, this);
-	CSearchPathsSettingsPage *recureseSearchPathPage = new CSearchPathsSettingsPage(true, this);
+	SearchPathsSettingsPage *recureseSearchPathPage = new SearchPathsSettingsPage(true, this);
 
 	generalSettings->applyGeneralSettings();
 	searchPathPage->applySearchPaths();
@@ -95,31 +95,6 @@ void CorePlugin::setNelContext(NLMISC::INelContext *nelContext)
 	m_libContext = new NLMISC::CLibraryContext(*nelContext);
 }
 
-QString CorePlugin::name() const
-{
-	return QLatin1String(Constants::OVQT_CORE_PLUGIN);
-}
-
-QString CorePlugin::version() const
-{
-	return Constants::OVQT_VERSION_LONG;
-}
-
-QString CorePlugin::vendor() const
-{
-	return Constants::OVQT_VENDOR;
-}
-
-QString CorePlugin::description() const
-{
-	return "Core plugin.";
-}
-
-QStringList CorePlugin::dependencies() const
-{
-	return QStringList();
-}
-
 void CorePlugin::addAutoReleasedObject(QObject *obj)
 {
 	m_plugMan->addObject(obj);

code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.h

@@ -53,12 +53,6 @@ public:
 
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void addAutoReleasedObject(QObject *obj);
 
 	ExtensionSystem::IPluginManager *pluginManager() const

code/nel/tools/3d/object_viewer_qt/src/plugins/core/general_settings_page.cpp

@@ -161,7 +161,7 @@ void GeneralSettingsPage::setPrimitivesPath()
 void GeneralSettingsPage::setLigoConfigFile()
 {
 	QString newFile = QFileDialog::getOpenFileName(0, tr("Set the ligo config file"),
-		m_ui.ligoConfigFileLineEdit->text());
+					  m_ui.ligoConfigFileLineEdit->text());
 	if (!newFile.isEmpty())
 	{
 		m_ui.ligoConfigFileLineEdit->setText(newFile);

code/nel/tools/3d/object_viewer_qt/src/plugins/core/general_settings_page.h

@@ -37,7 +37,7 @@ class GeneralSettingsPage : public Core::IOptionsPage
 	Q_OBJECT
 
 public:
-	GeneralSettingsPage(QObject *parent = 0);
+	explicit GeneralSettingsPage(QObject *parent = 0);
 	~GeneralSettingsPage();
 
 	QString id() const;

code/nel/tools/3d/object_viewer_qt/src/plugins/core/icore.h

@@ -35,7 +35,7 @@ class IPluginManager;
 
 namespace Core
 {
-class IMenuManager;
+class MenuManager;
 class ContextManager;
 
 class CORE_EXPORT ICore : public QObject
@@ -52,7 +52,7 @@ public:
 								   const QString &page = QString(),
 								   QWidget *parent = 0) = 0;
 
-	virtual IMenuManager *menuManager() const = 0;
+	virtual MenuManager *menuManager() const = 0;
 	virtual ContextManager *contextManager() const = 0;
 
 	virtual QSettings *settings() const = 0;

code/nel/tools/3d/object_viewer_qt/src/plugins/core/imenu_manager.h

@@ -1,62 +0,0 @@
-// 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 IMENU_MANAGER_H
-#define IMENU_MANAGER_H
-
-#include "core_global.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QList>
-
-QT_BEGIN_NAMESPACE
-class QMenu;
-class QAction;
-class QString;
-class QMenuBar;
-QT_END_NAMESPACE
-
-namespace Core
-{
-/*
-@interface IMenuManager
-@brief The IMenuManager is an interface for providing a registration of menus and menu item.
-@details The IMenuManager provides centralized access to menus and menu items.
-All menus and menu items should be registered in the IMenuManager.
-*/
-class CORE_EXPORT IMenuManager : public QObject
-{
-	Q_OBJECT
-public:
-	IMenuManager(QObject *parent = 0): QObject(parent) {}
-	virtual ~IMenuManager() {}
-
-	virtual void registerMenu(QMenu *menu, const QString &id) = 0;
-	virtual void registerAction(QAction *action, const QString &id) = 0;
-
-	virtual QMenu *menu(const QString &id) const = 0;
-	virtual QAction *action(const QString &id) const = 0;
-
-	virtual void unregisterMenu(const QString &id) = 0;
-	virtual void unregisterAction(const QString &id) = 0;
-
-	virtual QMenuBar *menuBar() const = 0;
-};
-
-} // namespace Core
-
-#endif // IMENU_MANAGER_H

code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp

@@ -65,8 +65,7 @@ MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *
 	setMenuBar(m_menuBar);
 #endif
 
-	m_menuManager = new MenuManager(this);
+	m_menuManager = new MenuManager(m_menuBar, this);
-	m_menuManager->setMenuBar(m_menuBar);
 
 	m_tabWidget = new QTabWidget(this);
 	m_tabWidget->setTabPosition(QTabWidget::South);
@@ -114,7 +113,7 @@ void MainWindow::extensionsInitialized()
 	show();
 }
 
-IMenuManager *MainWindow::menuManager() const
+MenuManager *MainWindow::menuManager() const
 {
 	return m_menuManager;
 }
@@ -205,7 +204,7 @@ bool MainWindow::showOptionsDialog(const QString &group,
 {
 	if (!parent)
 		parent = this;
-	CSettingsDialog settingsDialog(m_pluginManager, group, page, parent);
+	SettingsDialog settingsDialog(m_pluginManager, group, page, parent);
 	settingsDialog.show();
 	bool ok = settingsDialog.execDialog();
 	if (ok)

code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h

@@ -34,7 +34,6 @@ namespace Core
 class CSettingsDialog;
 class CorePlugin;
 class IContext;
-class IMenuManager;
 class MenuManager;
 class ContextManager;
 class CoreImpl;
@@ -50,7 +49,7 @@ public:
 	bool initialize(QString *errorString);
 	void extensionsInitialized();
 
-	IMenuManager *menuManager() const;
+	MenuManager *menuManager() const;
 	ContextManager *contextManager() const;
 	QSettings *settings() const;
 

code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.cpp

@@ -21,74 +21,76 @@
 // NeL includes
 #include <nel/misc/debug.h>
 
-// Qt includes
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
-
 namespace Core
 {
-MenuManager::MenuManager(QObject *parent)
+struct MenuManagerPrivate
-	: IMenuManager(parent),
-	  _menuBar(0)
 {
+	MenuManagerPrivate(): m_menuBar(0) {}
+	QMenuBar *m_menuBar;
+	typedef QHash<QString, QMenu *> IdMenuMap;
+	IdMenuMap m_menuMap;
+	typedef QHash<QString, QAction *> IdActionMap;
+	IdActionMap m_actionMap;
+};
+
+MenuManager::MenuManager(QMenuBar *menuBar, QObject *parent)
+	: QObject(parent),
+	  d(new MenuManagerPrivate())
+{
+	d->m_menuBar = menuBar;
 }
 
 MenuManager::~MenuManager()
 {
-	_menuMap.clear();
+	d->m_menuMap.clear();
+	delete d;
 }
 
 void MenuManager::registerMenu(QMenu *menu, const QString &id)
 {
 	menu->setObjectName(id);
-	_menuMap.insert(id, menu);
+	d->m_menuMap.insert(id, menu);
 }
 
 void MenuManager::registerAction(QAction *action, const QString &id)
 {
 	action->setObjectName(id);
-	_actionMap.insert(id, action);
+	d->m_actionMap.insert(id, action);
 }
 
 QMenu *MenuManager::menu(const QString &id) const
 {
 	QMenu *result = 0;
-	if (!_menuMap.contains(id))
+	if (!d->m_menuMap.contains(id))
 		nlwarning("QMenu %s not found", id.toStdString().c_str());
 	else
-		result = _menuMap.value(id);
+		result = d->m_menuMap.value(id);
 	return result;
 }
 
 QAction *MenuManager::action(const QString &id) const
 {
 	QAction *result = 0;
-	if (!_actionMap.contains(id))
+	if (!d->m_actionMap.contains(id))
 		nlwarning("QAction %s not found", id.toStdString().c_str());
 	else
-		result = _actionMap.value(id);
+		result = d->m_actionMap.value(id);
 	return result;
 }
 
 void MenuManager::unregisterMenu(const QString &id)
 {
-	_menuMap.remove(id);
+	d->m_menuMap.remove(id);
 }
 
 void MenuManager::unregisterAction(const QString &id)
 {
-	_actionMap.remove(id);
+	d->m_actionMap.remove(id);
 }
 
 QMenuBar *MenuManager::menuBar() const
 {
-	return _menuBar;
+	return d->m_menuBar;
-}
-
-void MenuManager::setMenuBar(QMenuBar *menuBar)
-{
-	_menuBar = menuBar;
 }
 
 } /* namespace Core */

code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.h

@@ -19,39 +19,47 @@
 #define MENU_MANAGER_H
 
 // Project includes
-#include "imenu_manager.h"
+#include "core_global.h"
 
 // Qt includes
 #include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QList>
+#include <QtGui/QMenu>
+#include <QtGui/QAction>
+#include <QtGui/QMenuBar>
 
 namespace Core
 {
+struct MenuManagerPrivate;
 
-class MenuManager : public IMenuManager
+/*
+@interface MenuManager
+@brief The MenuManager provide the interface for registration of menus and menu item.
+@details The MenuManager provides centralized access to menus and menu items.
+All menus and menu items should be registered in the MenuManager.
+*/
+class CORE_EXPORT MenuManager: public QObject
 {
 	Q_OBJECT
 
 public:
-	MenuManager(QObject *parent = 0);
+	MenuManager(QMenuBar *menuBar, QObject *parent = 0);
 	virtual ~MenuManager();
 
-	virtual void registerMenu(QMenu *menu, const QString &id);
+	void registerMenu(QMenu *menu, const QString &id);
-	virtual void registerAction(QAction *action, const QString &id);
+	void registerAction(QAction *action, const QString &id);
 
-	virtual QMenu *menu(const QString &id) const;
+	QMenu *menu(const QString &id) const;
-	virtual QAction *action(const QString &id) const;
+	QAction *action(const QString &id) const;
 
-	virtual void unregisterMenu(const QString &id);
+	void unregisterMenu(const QString &id);
-	virtual void unregisterAction(const QString &id);
+	void unregisterAction(const QString &id);
 
-	virtual QMenuBar *menuBar() const;
+	QMenuBar *menuBar() const;
-	void setMenuBar(QMenuBar *menuBar);
 private:
-	QMenuBar *_menuBar;
+
-	typedef QHash<QString, QMenu *> IdMenuMap;
+	MenuManagerPrivate *d;
-	IdMenuMap _menuMap;
-	typedef QHash<QString, QAction *> IdActionMap;
-	IdActionMap _actionMap;
 };
 
 } // namespace Core

code/nel/tools/3d/object_viewer_qt/src/plugins/core/ovqt_plugin_core.xml

@@ -0,0 +1,7 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_core</library-name>
+    <name>Core</name>
+    <version>0.8</version>
+    <vendor>Ryzom Core</vendor>
+    <description>Core plugin.</description>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.ui

@@ -112,7 +112,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../object_viewer_qt.qrc"/>
+  <include location="../../object_viewer_qt.qrc"/>
  </resources>
  <connections>
   <connection>

code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.cpp

@@ -40,9 +40,9 @@ typedef struct _MARGINS
 	int cyBottomHeight;
 } MARGINS, *PMARGINS;
 
-typedef HRESULT (WINAPI *PtrDwmIsCompositionEnabled)(BOOL* pfEnabled);
+typedef HRESULT (WINAPI *PtrDwmIsCompositionEnabled)(BOOL *pfEnabled);
-typedef HRESULT (WINAPI *PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS* pMarInset);
+typedef HRESULT (WINAPI *PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset);
-typedef HRESULT (WINAPI *PtrDwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND* pBlurBehind);
+typedef HRESULT (WINAPI *PtrDwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND *pBlurBehind);
 typedef HRESULT (WINAPI *PtrDwmGetColorizationColor)(DWORD *pcrColorization, BOOL *pfOpaqueBlend);
 
 static PtrDwmIsCompositionEnabled pDwmIsCompositionEnabled= 0;

code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp

@@ -33,18 +33,18 @@ namespace Core
 
 QString lastDir = ".";
 
-CSearchPathsSettingsPage::CSearchPathsSettingsPage(bool recurse, QObject *parent)
+SearchPathsSettingsPage::SearchPathsSettingsPage(bool recurse, QObject *parent)
 	: IOptionsPage(parent),
 	  m_recurse(recurse),
 	  m_page(0)
 {
 }
 
-CSearchPathsSettingsPage::~CSearchPathsSettingsPage()
+SearchPathsSettingsPage::~SearchPathsSettingsPage()
 {
 }
 
-QString CSearchPathsSettingsPage::id() const
+QString SearchPathsSettingsPage::id() const
 {
 	if (m_recurse)
 		return QLatin1String("search_recurse_paths");
@@ -52,7 +52,7 @@ QString CSearchPathsSettingsPage::id() const
 		return QLatin1String("search_paths");
 }
 
-QString CSearchPathsSettingsPage::trName() const
+QString SearchPathsSettingsPage::trName() const
 {
 	if (m_recurse)
 		return tr("Search Recurse Paths");
@@ -60,22 +60,22 @@ QString CSearchPathsSettingsPage::trName() const
 		return tr("Search Paths");
 }
 
-QString CSearchPathsSettingsPage::category() const
+QString SearchPathsSettingsPage::category() const
 {
 	return QLatin1String(Constants::SETTINGS_CATEGORY_GENERAL);
 }
 
-QString CSearchPathsSettingsPage::trCategory() const
+QString SearchPathsSettingsPage::trCategory() const
 {
 	return tr(Constants::SETTINGS_TR_CATEGORY_GENERAL);
 }
 
-QIcon CSearchPathsSettingsPage::categoryIcon() const
+QIcon SearchPathsSettingsPage::categoryIcon() const
 {
 	return QIcon();
 }
 
-QWidget *CSearchPathsSettingsPage::createPage(QWidget *parent)
+QWidget *SearchPathsSettingsPage::createPage(QWidget *parent)
 {
 	m_page = new QWidget(parent);
 	m_ui.setupUi(m_page);
@@ -90,19 +90,19 @@ QWidget *CSearchPathsSettingsPage::createPage(QWidget *parent)
 	return m_page;
 }
 
-void CSearchPathsSettingsPage::apply()
+void SearchPathsSettingsPage::apply()
 {
 	writeSettings();
 	applySearchPaths();
 }
 
-void CSearchPathsSettingsPage::finish()
+void SearchPathsSettingsPage::finish()
 {
 	delete m_page;
 	m_page = 0;
 }
 
-void CSearchPathsSettingsPage::applySearchPaths()
+void SearchPathsSettingsPage::applySearchPaths()
 {
 	QStringList paths, remapExt;
 	QSettings *settings = Core::ICore::instance()->settings();
@@ -124,7 +124,7 @@ void CSearchPathsSettingsPage::applySearchPaths()
 	}
 }
 
-void CSearchPathsSettingsPage::addPath()
+void SearchPathsSettingsPage::addPath()
 {
 	QString newPath = QFileDialog::getExistingDirectory(m_page, "", lastDir);
 	if (!newPath.isEmpty())
@@ -139,7 +139,7 @@ void CSearchPathsSettingsPage::addPath()
 	checkEnabledButton();
 }
 
-void CSearchPathsSettingsPage::delPath()
+void SearchPathsSettingsPage::delPath()
 {
 	QListWidgetItem *removeItem = m_ui.pathsListWidget->takeItem(m_ui.pathsListWidget->currentRow());
 	if (!removeItem)
@@ -148,7 +148,7 @@ void CSearchPathsSettingsPage::delPath()
 	checkEnabledButton();
 }
 
-void CSearchPathsSettingsPage::upPath()
+void SearchPathsSettingsPage::upPath()
 {
 	int currentRow = m_ui.pathsListWidget->currentRow();
 	if (!(currentRow == 0))
@@ -159,7 +159,7 @@ void CSearchPathsSettingsPage::upPath()
 	}
 }
 
-void CSearchPathsSettingsPage::downPath()
+void SearchPathsSettingsPage::downPath()
 {
 	int currentRow = m_ui.pathsListWidget->currentRow();
 	if (!(currentRow == m_ui.pathsListWidget->count()-1))
@@ -170,7 +170,7 @@ void CSearchPathsSettingsPage::downPath()
 	}
 }
 
-void CSearchPathsSettingsPage::readSettings()
+void SearchPathsSettingsPage::readSettings()
 {
 	QStringList paths;
 	QSettings *settings = Core::ICore::instance()->settings();
@@ -189,7 +189,7 @@ void CSearchPathsSettingsPage::readSettings()
 	}
 }
 
-void CSearchPathsSettingsPage::writeSettings()
+void SearchPathsSettingsPage::writeSettings()
 {
 	QStringList paths;
 	for (int i = 0; i < m_ui.pathsListWidget->count(); ++i)
@@ -205,7 +205,7 @@ void CSearchPathsSettingsPage::writeSettings()
 	settings->sync();
 }
 
-void CSearchPathsSettingsPage::checkEnabledButton()
+void SearchPathsSettingsPage::checkEnabledButton()
 {
 	bool bEnabled = true;
 	if (m_ui.pathsListWidget->count() == 0)

code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h

@@ -30,15 +30,15 @@ class QWidget;
 namespace Core
 {
 /**
-@class CSearchPathsSettingsPage
+@class SearchPathsSettingsPage
 */
-class CSearchPathsSettingsPage : public Core::IOptionsPage
+class SearchPathsSettingsPage : public Core::IOptionsPage
 {
 	Q_OBJECT
 
 public:
-	explicit CSearchPathsSettingsPage(bool recurse, QObject *parent = 0);
+	explicit SearchPathsSettingsPage(bool recurse, QObject *parent = 0);
-	~CSearchPathsSettingsPage();
+	~SearchPathsSettingsPage();
 
 	QString id() const;
 	QString trName() const;
@@ -66,7 +66,7 @@ private:
 
 	bool m_recurse;
 	QWidget *m_page;
-	Ui::CSearchPathsSettingsPage m_ui;
+	Ui::SearchPathsSettingsPage m_ui;
 };
 
 } // namespace Core

code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CSearchPathsSettingsPage</class>
+ <class>SearchPathsSettingsPage</class>
- <widget class="QWidget" name="CSearchPathsSettingsPage">
+ <widget class="QWidget" name="SearchPathsSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp

@@ -35,33 +35,33 @@ Q_DECLARE_METATYPE(PageData);
 
 namespace Core
 {
-CSettingsDialog::CSettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
+SettingsDialog::SettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
-								 const QString &categoryId,
+							   const QString &categoryId,
-								 const QString &pageId,
+							   const QString &pageId,
-								 QWidget *parent)
+							   QWidget *parent)
 	: QDialog(parent),
-	  _applied(false)
+	  m_applied(false)
 {
-	_ui.setupUi(this);
+	m_ui.setupUi(this);
 
-	_plugMan = pluginManager;
+	m_plugMan = pluginManager;
 
 	QString initialCategory = categoryId;
 	QString initialPage = pageId;
 
-	_ui.buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+	m_ui.buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
-	connect(_ui.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(apply()));
+	connect(m_ui.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(apply()));
 
-	_ui.splitter->setCollapsible(1, false);
+	m_ui.splitter->setCollapsible(1, false);
-	_ui.pageTree->header()->setVisible(false);
+	m_ui.pageTree->header()->setVisible(false);
 
-	connect(_ui.pageTree, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
+	connect(m_ui.pageTree, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
 			this, SLOT(pageSelected()));
 
 	QMap<QString, QTreeWidgetItem *> categories;
 
-	QList<IOptionsPage *> pages = _plugMan->getObjects<IOptionsPage>();
+	QList<IOptionsPage *> pages = m_plugMan->getObjects<IOptionsPage>();
 
 	int index = 0;
 	Q_FOREACH(IOptionsPage *page, pages)
@@ -82,7 +82,7 @@ CSettingsDialog::CSettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
 		QTreeWidgetItem *treeitem;
 		if (!categories.contains(currentCategory))
 		{
-			treeitem = new QTreeWidgetItem(_ui.pageTree);
+			treeitem = new QTreeWidgetItem(m_ui.pageTree);
 			treeitem->setText(0, trCategories.at(0));
 			treeitem->setData(0, Qt::UserRole, qVariantFromValue(pageData));
 			categories.insert(currentCategory, treeitem);
@@ -108,13 +108,13 @@ CSettingsDialog::CSettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
 
 		categories.value(currentCategory)->addChild(item);
 
-		_pages.append(page);
+		m_pages.append(page);
-		_ui.stackedPages->addWidget(page->createPage(_ui.stackedPages));
+		m_ui.stackedPages->addWidget(page->createPage(m_ui.stackedPages));
 
 		if (page->id() == initialPage && currentCategory == initialCategory)
 		{
-			_ui.stackedPages->setCurrentIndex(_ui.stackedPages->count());
+			m_ui.stackedPages->setCurrentIndex(m_ui.stackedPages->count());
-			_ui.pageTree->setCurrentItem(item);
+			m_ui.pageTree->setCurrentItem(item);
 		}
 
 		index++;
@@ -122,30 +122,30 @@ CSettingsDialog::CSettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
 
 	QList<int> sizes;
 	sizes << 150 << 300;
-	_ui.splitter->setSizes(sizes);
+	m_ui.splitter->setSizes(sizes);
 
-	_ui.splitter->setStretchFactor(_ui.splitter->indexOf(_ui.pageTree), 0);
+	m_ui.splitter->setStretchFactor(m_ui.splitter->indexOf(m_ui.pageTree), 0);
-	_ui.splitter->setStretchFactor(_ui.splitter->indexOf(_ui.layoutWidget), 1);
+	m_ui.splitter->setStretchFactor(m_ui.splitter->indexOf(m_ui.layoutWidget), 1);
 }
 
-CSettingsDialog::~CSettingsDialog()
+SettingsDialog::~SettingsDialog()
 {
 }
 
-void CSettingsDialog::pageSelected()
+void SettingsDialog::pageSelected()
 {
-	QTreeWidgetItem *item = _ui.pageTree->currentItem();
+	QTreeWidgetItem *item = m_ui.pageTree->currentItem();
 	PageData data = item->data(0, Qt::UserRole).value<PageData>();
 	int index = data.index;
-	_currentCategory = data.category;
+	m_currentCategory = data.category;
-	_currentPage = data.id;
+	m_currentPage = data.id;
-	_ui.stackedPages->setCurrentIndex(index);
+	m_ui.stackedPages->setCurrentIndex(index);
 }
 
-void CSettingsDialog::accept()
+void SettingsDialog::accept()
 {
-	_applied = true;
+	m_applied = true;
-	Q_FOREACH(IOptionsPage *page, _pages)
+	Q_FOREACH(IOptionsPage *page, m_pages)
 	{
 		page->apply();
 		page->finish();
@@ -153,28 +153,28 @@ void CSettingsDialog::accept()
 	done(QDialog::Accepted);
 }
 
-void CSettingsDialog::reject()
+void SettingsDialog::reject()
 {
-	Q_FOREACH(IOptionsPage *page, _pages)
+	Q_FOREACH(IOptionsPage *page, m_pages)
 	page->finish();
 	done(QDialog::Rejected);
 }
 
-void CSettingsDialog::apply()
+void SettingsDialog::apply()
 {
-	Q_FOREACH(IOptionsPage *page, _pages)
+	Q_FOREACH(IOptionsPage *page, m_pages)
 	page->apply();
-	_applied = true;
+	m_applied = true;
 }
 
-bool CSettingsDialog::execDialog()
+bool SettingsDialog::execDialog()
 {
-	_applied = false;
+	m_applied = false;
 	exec();
-	return _applied;
+	return m_applied;
 }
 
-void CSettingsDialog::done(int val)
+void SettingsDialog::done(int val)
 {
 	QDialog::done(val);
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.h

@@ -35,17 +35,17 @@ class IOptionsPage;
 @class CSettingsDialog
 @brief Settings dialog
 */
-class CSettingsDialog: public QDialog
+class SettingsDialog: public QDialog
 {
 	Q_OBJECT
 
 public:
-	CSettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
+	SettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
-					const QString &initialCategory = QString(),
+				   const QString &initialCategory = QString(),
-					const QString &initialPage = QString(),
+				   const QString &initialPage = QString(),
-					QWidget *parent = 0);
+				   QWidget *parent = 0);
 
-	~CSettingsDialog();
+	~SettingsDialog();
 
 	/// Run the dialog and return true if 'Ok' was choosen or 'Apply' was invoked at least once
 	bool execDialog();
@@ -60,14 +60,14 @@ private Q_SLOTS:
 	void apply();
 
 private:
-	QList<IOptionsPage *> _pages;
+	QList<IOptionsPage *> m_pages;
-	bool _applied;
+	bool m_applied;
-	QString _currentCategory;
+	QString m_currentCategory;
-	QString _currentPage;
+	QString m_currentPage;
 
-	ExtensionSystem::IPluginManager *_plugMan;
+	ExtensionSystem::IPluginManager *m_plugMan;
 
-	Ui::CSettingsDialog _ui;
+	Ui::SettingsDialog m_ui;
 }; /* class CSettingsDialog */
 
 } /* namespace Core */

code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CSettingsDialog</class>
+ <class>SettingsDialog</class>
- <widget class="QDialog" name="CSettingsDialog">
+ <widget class="QDialog" name="SettingsDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -93,7 +93,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>CSettingsDialog</receiver>
+   <receiver>SettingsDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -109,7 +109,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>CSettingsDialog</receiver>
+   <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

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

@@ -28,7 +28,7 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
 
 ADD_LIBRARY(ovqt_plugin_disp_sheet_id MODULE ${SRC} ${OVQT_DISP_SHEET_ID_PLUGIN_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_DISP_SHEET_ID_PLUGIN_UI_HDRS})
 
-TARGET_LINK_LIBRARIES(ovqt_plugin_disp_sheet_id ovqt_plugin_core nelmisc nel3d ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(ovqt_plugin_disp_sheet_id ovqt_plugin_core nelmisc ${QT_LIBRARIES})
 
 IF(WITH_STLPORT)
   TARGET_LINK_LIBRARIES(ovqt_plugin_disp_sheet_id ${CMAKE_THREAD_LIBS_INIT})

code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp

@@ -18,7 +18,7 @@
 #include "disp_sheet_id_plugin.h"
 #include "sheet_id_view.h"
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../core/core_constants.h"
 
 // Qt includes
@@ -37,13 +37,13 @@ using namespace SheetIdViewPlugin;
 bool DispSheetIdPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
 {
 	Q_UNUSED(errorString);
-	_plugMan = pluginManager;
+	m_plugMan = pluginManager;
 	return true;
 }
 
 void DispSheetIdPlugin::extensionsInitialized()
 {
-	Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager();
+	Core::MenuManager *menuManager = Core::ICore::instance()->menuManager();
 
 	QMenu *sheetMenu = menuManager->menu(Core::Constants::M_SHEET);
 	QAction *sheetIdViewAction = sheetMenu->addAction(tr("Sheet id view"));
@@ -67,34 +67,7 @@ void DispSheetIdPlugin::setNelContext(NLMISC::INelContext *nelContext)
 	// This only applies to platforms without PIC, e.g. Windows.
 	nlassert(!NLMISC::INelContext::isContextInitialised());
 #endif // NL_OS_WINDOWS
-	_LibContext = new NLMISC::CLibraryContext(*nelContext);
+	m_LibContext = new NLMISC::CLibraryContext(*nelContext);
-}
-
-QString DispSheetIdPlugin::name() const
-{
-	return "Display sheet id";
-}
-
-QString DispSheetIdPlugin::version() const
-{
-	return "1.0";
-}
-
-QString DispSheetIdPlugin::vendor() const
-{
-	return "pemeon";
-}
-
-QString DispSheetIdPlugin::description() const
-{
-	return "Display sheet id";
-}
-
-QStringList DispSheetIdPlugin::dependencies() const
-{
-	QStringList list;
-	list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	return list;
 }
 
 Q_EXPORT_PLUGIN(DispSheetIdPlugin)

code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h

@@ -28,11 +28,6 @@ namespace NLMISC
 class CLibraryContext;
 }
 
-namespace NLQT
-{
-class IPluginSpec;
-}
-
 namespace SheetIdViewPlugin
 {
 
@@ -44,23 +39,16 @@ public:
 
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 private Q_SLOTS:
 	void execMessageBox();
 
 protected:
-	NLMISC::CLibraryContext *_LibContext;
+	NLMISC::CLibraryContext *m_LibContext;
 
 private:
-	ExtensionSystem::IPluginManager *_plugMan;
+	ExtensionSystem::IPluginManager *m_plugMan;
 
 };
 

code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_disp_sheet_id</library-name>
+    <name>DisplaySheetId</name>
+    <version>1.0</version>
+    <vendor>pemeon</vendor>
+    <description>Display sheet id.</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.cpp

@@ -65,8 +65,8 @@ void SheetIdView::pushToTable()
 	m_ui.table->setColumnCount(2);
 	for (size_t i = 0; i < m_sheetList.size(); i++)
 	{
-		QTableWidgetItem* item1 = new QTableWidgetItem(QString(m_sheetList[i].toString().c_str()));
+		QTableWidgetItem *item1 = new QTableWidgetItem(QString(m_sheetList[i].toString().c_str()));
-		QTableWidgetItem* item2 = new QTableWidgetItem(QString("%1").arg(m_sheetList[i].asInt()));
+		QTableWidgetItem *item2 = new QTableWidgetItem(QString("%1").arg(m_sheetList[i].asInt()));
 		m_ui.table->setItem(i,1,item1);
 		m_ui.table->setItem(i,2,item2);
 	}

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

@@ -9,10 +9,10 @@ SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.
 						${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h
 						${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
 
-SET(OVQT_PLUG_EXAMPLE_HDR 	plugin1.h
+SET(OVQT_PLUG_EXAMPLE_HDR 	example_plugin.h
-							qnel_widget.h
+				qnel_widget.h
-							simple_viewer.h
+				simple_viewer.h
-							example_settings_page.h)
+				example_settings_page.h)
 
 SET(OVQT_PLUG_EXAMPLE_UIS	example_settings_page.ui)
 

code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_plugin.cpp

@@ -0,0 +1,83 @@
+// Project includes
+#include "example_plugin.h"
+#include "example_settings_page.h"
+#include "simple_viewer.h"
+
+#include "../core/icore.h"
+#include "../core/core_constants.h"
+#include "../core/menu_manager.h"
+
+#include "../../extension_system/iplugin_spec.h"
+
+// NeL includes
+#include "nel/misc/debug.h"
+
+// Qt includes
+#include <QtCore/QObject>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMenu>
+#include <QtGui/QAction>
+#include <QtGui/QMenuBar>
+
+namespace Plugin
+{
+
+ExamplePlugin::ExamplePlugin()
+{
+}
+
+ExamplePlugin::~ExamplePlugin()
+{
+	Q_FOREACH(QObject *obj, m_autoReleaseObjects)
+	{
+		m_plugMan->removeObject(obj);
+	}
+	qDeleteAll(m_autoReleaseObjects);
+	m_autoReleaseObjects.clear();
+}
+
+bool ExamplePlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
+{
+	Q_UNUSED(errorString);
+	m_plugMan = pluginManager;
+
+	addAutoReleasedObject(new ExampleSettingsPage(this));
+	addAutoReleasedObject(new ExampleContext(this));
+	addAutoReleasedObject(new ExampleCoreListener(this));
+	return true;
+}
+
+void ExamplePlugin::extensionsInitialized()
+{
+	Core::ICore *core = Core::ICore::instance();
+	Core::MenuManager *menuManager = core->menuManager();
+	QAction *exampleAction1 = new QAction("Example1", this);
+	QAction *exampleAction2 = new QAction("Example2", this);
+	QAction *aboutQtAction = menuManager->action(Core::Constants::ABOUT_QT);
+	QMenu *helpMenu = menuManager->menu(Core::Constants::M_HELP);
+	helpMenu->insertAction(aboutQtAction, exampleAction1);
+	helpMenu->addSeparator();
+	helpMenu->addAction(exampleAction2);
+	menuManager->menuBar()->addMenu("ExampleMenu");
+}
+
+void ExamplePlugin::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 ExamplePlugin::addAutoReleasedObject(QObject *obj)
+{
+	m_plugMan->addObject(obj);
+	m_autoReleaseObjects.prepend(obj);
+}
+
+}
+
+Q_EXPORT_PLUGIN(Plugin::ExamplePlugin)

code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_plugin.h

@@ -18,56 +18,41 @@ namespace NLMISC
 class CLibraryContext;
 }
 
-namespace ExtensionSystem
-{
-class IPluginSpec;
-}
-
 namespace Plugin
 {
 
-class MyPlugin : public QObject, public ExtensionSystem::IPlugin
+class ExamplePlugin : public QObject, public ExtensionSystem::IPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES(ExtensionSystem::IPlugin)
 public:
-
+	ExamplePlugin();
-	virtual ~MyPlugin();
+	virtual ~ExamplePlugin();
 
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void addAutoReleasedObject(QObject *obj);
 
-	QObject *objectByName(const QString &name) const;
-	ExtensionSystem::IPluginSpec *pluginByName(const QString &name) const;
-
 protected:
-	NLMISC::CLibraryContext *_LibContext;
+	NLMISC::CLibraryContext *m_LibContext;
 
 private:
-	ExtensionSystem::IPluginManager *_plugMan;
+	ExtensionSystem::IPluginManager *m_plugMan;
-	QList<QObject *> _autoReleaseObjects;
+	QList<QObject *> m_autoReleaseObjects;
 };
 
-class CExampleContext: public Core::IContext
+class ExampleContext: public Core::IContext
 {
 	Q_OBJECT
 public:
-	CExampleContext(QObject *parent = 0): IContext(parent)
+	ExampleContext(QObject *parent = 0): IContext(parent)
 	{
-		m_simpleViewer = new CSimpleViewer();
+		m_simpleViewer = new SimpleViewer();
 	}
 
-	virtual ~CExampleContext() {}
+	virtual ~ExampleContext() {}
 
 	virtual QString id() const
 	{
@@ -95,7 +80,7 @@ public:
 	{
 	}
 
-	CSimpleViewer *m_simpleViewer;
+	SimpleViewer *m_simpleViewer;
 };
 
 } // namespace Plugin

code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.cpp

@@ -27,45 +27,45 @@
 namespace Plugin
 {
 
-CExampleSettingsPage::CExampleSettingsPage(QObject *parent)
+ExampleSettingsPage::ExampleSettingsPage(QObject *parent)
 	: IOptionsPage(parent),
-	  _currentPage(NULL)
+	  m_currentPage(0)
 {
 }
 
-QString CExampleSettingsPage::id() const
+QString ExampleSettingsPage::id() const
 {
 	return QLatin1String("ExamplePage");
 }
 
-QString CExampleSettingsPage::trName() const
+QString ExampleSettingsPage::trName() const
 {
 	return tr("Example page");
 }
 
-QString CExampleSettingsPage::category() const
+QString ExampleSettingsPage::category() const
 {
-	return QLatin1String("General");
+	return QLatin1String("Example");
 }
 
-QString CExampleSettingsPage::trCategory() const
+QString ExampleSettingsPage::trCategory() const
 {
-	return tr("General");
+	return tr("Example");
 }
 
-QIcon CExampleSettingsPage::categoryIcon() const
+QIcon ExampleSettingsPage::categoryIcon() const
 {
 	return QIcon();
 }
 
-QWidget *CExampleSettingsPage::createPage(QWidget *parent)
+QWidget *ExampleSettingsPage::createPage(QWidget *parent)
 {
-	_currentPage = new QWidget(parent);
+	m_currentPage = new QWidget(parent);
-	_ui.setupUi(_currentPage);
+	m_ui.setupUi(m_currentPage);
-	return _currentPage;
+	return m_currentPage;
 }
 
-void CExampleSettingsPage::apply()
+void ExampleSettingsPage::apply()
 {
 }
 

code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.h

@@ -29,15 +29,13 @@ class QWidget;
 
 namespace Plugin
 {
-/**
+
-@class CExampleSettingsPage
+class ExampleSettingsPage : public Core::IOptionsPage
-*/
-class CExampleSettingsPage : public Core::IOptionsPage
 {
 	Q_OBJECT
 public:
-	CExampleSettingsPage(QObject *parent = 0);
+	ExampleSettingsPage(QObject *parent = 0);
-	virtual ~CExampleSettingsPage() {}
+	virtual ~ExampleSettingsPage() {}
 
 	virtual QString id() const;
 	virtual QString trName() const;
@@ -50,8 +48,8 @@ public:
 	virtual void finish() {}
 
 private:
-	QWidget *_currentPage;
+	QWidget *m_currentPage;
-	Ui::CExampleSettingsPage _ui;
+	Ui::ExampleSettingsPage m_ui;
 };
 
 } // namespace Plugin

code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CExampleSettingsPage</class>
+ <class>ExampleSettingsPage</class>
- <widget class="QWidget" name="CExampleSettingsPage">
+ <widget class="QWidget" name="ExampleSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

code/nel/tools/3d/object_viewer_qt/src/plugins/example/ovqt_plugin_example.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_example</library-name>
+    <name>ExamplePlugin</name>
+    <version>0.2</version>
+    <vendor>dnk-88</vendor>
+    <description>Example ovqt plugin.</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp

@@ -1,120 +0,0 @@
-// Project includes
-#include "plugin1.h"
-#include "example_settings_page.h"
-#include "simple_viewer.h"
-#include "../core/icore.h"
-#include "../core/core_constants.h"
-#include "../core/imenu_manager.h"
-#include "../../extension_system/iplugin_spec.h"
-
-// NeL includes
-#include "nel/misc/debug.h"
-
-// Qt includes
-#include <QtCore/QObject>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
-
-namespace Plugin
-{
-MyPlugin::~MyPlugin()
-{
-	Q_FOREACH(QObject *obj, _autoReleaseObjects)
-	{
-		_plugMan->removeObject(obj);
-	}
-	qDeleteAll(_autoReleaseObjects);
-	_autoReleaseObjects.clear();
-}
-
-bool MyPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
-{
-	Q_UNUSED(errorString);
-	_plugMan = pluginManager;
-
-	addAutoReleasedObject(new CExampleSettingsPage(this));
-	addAutoReleasedObject(new CExampleContext(this));
-	addAutoReleasedObject(new CCoreListener(this));
-	return true;
-}
-
-void MyPlugin::extensionsInitialized()
-{
-	Core::ICore *core = Core::ICore::instance();
-	Core::IMenuManager *menuManager = core->menuManager();
-	//menuManager = _plugMan->getObject<Core::IMenuManager>();
-	QAction *exampleAction1 = new QAction("Example1", this);
-	QAction *exampleAction2 = new QAction("Example2", this);
-	QAction *aboutQtAction = menuManager->action(Core::Constants::ABOUT_QT);
-	QMenu *helpMenu = menuManager->menu(Core::Constants::M_HELP);
-	helpMenu->insertAction(aboutQtAction, exampleAction1);
-	helpMenu->addSeparator();
-	helpMenu->addAction(exampleAction2);
-	menuManager->menuBar()->addMenu("ExampleMenu");
-}
-
-void MyPlugin::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
-	_LibContext = new NLMISC::CLibraryContext(*nelContext);
-}
-
-QString MyPlugin::name() const
-{
-	return "ExamplePlugin";
-}
-
-QString MyPlugin::version() const
-{
-	return "0.2";
-}
-
-QString MyPlugin::vendor() const
-{
-	return "dnk-88";
-}
-
-QString MyPlugin::description() const
-{
-	return "Example ovqt plugin.";
-}
-
-QStringList MyPlugin::dependencies() const
-{
-	QStringList list;
-	list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	return list;
-}
-
-void MyPlugin::addAutoReleasedObject(QObject *obj)
-{
-	_plugMan->addObject(obj);
-	_autoReleaseObjects.prepend(obj);
-}
-
-QObject* MyPlugin::objectByName(const QString &name) const
-{
-	Q_FOREACH (QObject *qobj, _plugMan->allObjects())
-	if (qobj->objectName() == name)
-		return qobj;
-	return 0;
-}
-
-ExtensionSystem::IPluginSpec *MyPlugin::pluginByName(const QString &name) const
-{
-	Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins())
-	if (spec->name() == name)
-		return spec;
-	return 0;
-}
-
-}
-
-Q_EXPORT_PLUGIN(Plugin::MyPlugin)

code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.h

@@ -82,7 +82,7 @@ public:
 		return m_driver;
 	}
 
-	virtual QPaintEngine* paintEngine() const
+	virtual QPaintEngine *paintEngine() const
 	{
 		return NULL;
 	}

code/nel/tools/3d/object_viewer_qt/src/plugins/example/simple_viewer.cpp

@@ -29,19 +29,19 @@
 namespace Plugin
 {
 
-CSimpleViewer::CSimpleViewer(QWidget *parent)
+SimpleViewer::SimpleViewer(QWidget *parent)
 	: QWidget(parent)
 {
 	QGridLayout *gridLayout = new QGridLayout(this);
 	gridLayout->setObjectName(QString::fromUtf8("gridLayoutSimpleViewer"));
 	gridLayout->setContentsMargins(0, 0, 0, 0);
-	NLQT::QNLWidget *_nelWidget = new NLQT::QNLWidget(this);
+	NLQT::QNLWidget *m_nelWidget = new NLQT::QNLWidget(this);
-	gridLayout->addWidget(_nelWidget, 0, 0, 1, 1);
+	gridLayout->addWidget(m_nelWidget, 0, 0, 1, 1);
 
 	m_undoStack = new QUndoStack(this);
 }
 
-bool CCoreListener::closeMainWindow() const
+bool ExampleCoreListener::closeMainWindow() const
 {
 	int ret = QMessageBox::question(0, tr("Example close event hook"),
 									tr("Do you want to close window?"),

code/nel/tools/3d/object_viewer_qt/src/plugins/example/simple_viewer.h

@@ -31,22 +31,22 @@ class QWidget;
 namespace Plugin
 {
 
-class CSimpleViewer : public QWidget
+class SimpleViewer : public QWidget
 {
 	Q_OBJECT
 public:
-	CSimpleViewer(QWidget *parent = 0);
+	SimpleViewer(QWidget *parent = 0);
-	virtual ~CSimpleViewer() {}
+	virtual ~SimpleViewer() {}
 
 	QUndoStack *m_undoStack;
 };
 
-class CCoreListener : public Core::ICoreListener
+class ExampleCoreListener : public Core::ICoreListener
 {
 	Q_OBJECT
 public:
-	CCoreListener(QObject *parent = 0): ICoreListener(parent) {}
+	ExampleCoreListener(QObject *parent = 0): ICoreListener(parent) {}
-	virtual ~CCoreListener() {}
+	virtual ~ExampleCoreListener() {}
 
 	virtual bool closeMainWindow() const;
 };

code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp

@@ -21,7 +21,7 @@
 #include "georges_treeview_dialog.h"
 
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../core/core_constants.h"
 
 // NeL includes
@@ -63,7 +63,7 @@ namespace Plugin
 
 		m_undoStack = new QUndoStack(this);
 
-		Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager();
+		Core::MenuManager *menuManager = Core::ICore::instance()->menuManager();
 		m_openAction = menuManager->action(Core::Constants::OPEN);
 
 		m_newAction = new QAction(tr("&New..."), this);

code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp

@@ -67,35 +67,6 @@ void GeorgesEditorPlugin::setNelContext(NLMISC::INelContext *nelContext)
 	m_libContext = new NLMISC::CLibraryContext(*nelContext);
 }
 
-QString GeorgesEditorPlugin::name() const
-{
-	return tr("Georges Editor");
-}
-
-QString GeorgesEditorPlugin::version() const
-{
-	return "0.4";
-}
-
-QString GeorgesEditorPlugin::vendor() const
-{
-	return "aquiles";
-}
-
-QString GeorgesEditorPlugin::description() const
-{
-	return tr("Tool to create & edit sheets or forms.");
-}
-
-QStringList GeorgesEditorPlugin::dependencies() const
-{
-	QStringList list;
-	// TODO
-	//list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	//list.append("ObjectViewer");
-	return list;
-}
-
 void GeorgesEditorPlugin::addAutoReleasedObject(QObject *obj)
 {
 	m_plugMan->addObject(obj);

code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h

@@ -52,15 +52,8 @@ public:
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
 	void shutdown();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void addAutoReleasedObject(QObject *obj);
 
 protected:

code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_georges_editor</library-name>
+    <name>GeorgesEditor</name>
+    <version>0.4</version>
+    <vendor>aquiles</vendor>
+    <description>Tool to create and edit sheets or forms.</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.cpp

@@ -20,7 +20,6 @@
 #include "landscape_editor_constants.h"
 
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
 #include "../core/core_constants.h"
 
 // NeL includes
@@ -72,7 +71,6 @@ void LandscapeEditorWindow::open()
 
 void LandscapeEditorWindow::createMenus()
 {
-	Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager();
 }
 
 void LandscapeEditorWindow::readSettings()

code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp

@@ -21,7 +21,7 @@
 
 #include "../core/icore.h"
 #include "../core/core_constants.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../../extension_system/iplugin_spec.h"
 
 // Qt includes
@@ -78,7 +78,7 @@ namespace Plugin
 		setDisplayers();
 
 		Core::ICore *core = Core::ICore::instance();
-		Core::IMenuManager *menuManager = core->menuManager();
+		Core::MenuManager *menuManager = core->menuManager();
 		QMenu *viewMenu = menuManager->menu(Core::Constants::M_VIEW);
 
 		QMainWindow *wnd = Core::ICore::instance()->mainWindow();

code/nel/tools/3d/object_viewer_qt/src/plugins/log/ovqt_plugin_log.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_log</library-name>
+    <name>LogPlugin</name>
+    <version>1.1</version>
+    <vendor>aquiles</vendor>
+    <description>DockWidget to display all log messages from NeL.</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp

@@ -16,7 +16,7 @@
 #include <QTableWidgetItem>
 
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../core/core_constants.h"
 
 #include <nel/misc/common.h>
@@ -379,7 +379,7 @@ bool MissionCompilerMainWindow::parsePrimForMissions(NLLIGO::IPrimitive const *p
 {
 	std::string value;
 	// if the node is a mission parse it
-	if (prim->getPropertyByName("class",value) && !stricmp(value.c_str(),"mission") )
+	if (prim->getPropertyByName("class",value) && !NLMISC::stricmp(value.c_str(),"mission") )
 	{
 		std::string name;
 		prim->getPropertyByName("name",name);

code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.ui

@@ -234,9 +234,10 @@
              </item>
              <item>
               <widget class="QLineEdit" name="filterEdit">
+               <!-- Removed due to incompatibility with Qt 4.6 and uic still adding it to the source.
                <property name="placeholderText">
                 <string>type filter here</string>
-               </property>
+               </property> -->
               </widget>
              </item>
              <item>

code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin.cpp

@@ -2,7 +2,7 @@
 #include "mission_compiler_plugin.h"
 #include "../core/icore.h"
 #include "../core/core_constants.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../../extension_system/iplugin_spec.h"
 
 // NeL includes
@@ -24,18 +24,18 @@ namespace MissionCompiler
 
 MissionCompilerPlugin::~MissionCompilerPlugin()
 {
-	Q_FOREACH(QObject *obj, _autoReleaseObjects)
+	Q_FOREACH(QObject *obj, m_autoReleaseObjects)
 	{
-		_plugMan->removeObject(obj);
+		m_plugMan->removeObject(obj);
 	}
-	qDeleteAll(_autoReleaseObjects);
+	qDeleteAll(m_autoReleaseObjects);
-	_autoReleaseObjects.clear();
+	m_autoReleaseObjects.clear();
 }
 
 bool MissionCompilerPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
 {
 	Q_UNUSED(errorString);
-	_plugMan = pluginManager;
+	m_plugMan = pluginManager;
 
 	addAutoReleasedObject(new MissionCompilerSettingsPage(this));
 	addAutoReleasedObject(new CMissionCompilerContext(this));
@@ -47,18 +47,7 @@ void MissionCompilerPlugin::extensionsInitialized()
 {
 	Core::ICore *core = Core::ICore::instance();
 	QSettings *settings = Core::ICore::instance()->settings();
-	Core::IMenuManager *menuManager = core->menuManager();
+	Core::MenuManager *menuManager = core->menuManager();
-	//menuManager = _plugMan->getObject<Core::IMenuManager>();
-	//QAction *exampleAction1 = new QAction("Zone1", this);
-	//QAction *exampleAction2 = new QAction("Zone2", this);
-	//QMenu *toolsMenu = menuManager->menu(Core::Constants::M_TOOLS);
-	//helpMenu->insertAction(aboutQtAction, exampleAction1);
-	//helpMenu->addSeparator();
-	//helpMenu->addAction(exampleAction2);
-	//QMenu *zoneMenu = menuManager->menuBar()->addMenu("ZoneMenu");
-	//zoneMenu->insertAction(aboutQtAction, exampleAction1);
-	//zoneMenu->addSeparator();
-	//zoneMenu->addAction(exampleAction2);
 
 	// Initialize Ligo.
 	//settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
@@ -73,57 +62,13 @@ void MissionCompilerPlugin::setNelContext(NLMISC::INelContext *nelContext)
 	// This only applies to platforms without PIC, e.g. Windows.
 	nlassert(!NLMISC::INelContext::isContextInitialised());
 #endif // NL_OS_WINDOWS
-	_LibContext = new NLMISC::CLibraryContext(*nelContext);
+	m_LibContext = new NLMISC::CLibraryContext(*nelContext);
-}
-
-QString MissionCompilerPlugin::name() const
-{
-	return "MissionCompilerPlugin";
-}
-
-QString MissionCompilerPlugin::version() const
-{
-	return "0.1";
-}
-
-QString MissionCompilerPlugin::vendor() const
-{
-	return "Ryzom Core";
-}
-
-QString MissionCompilerPlugin::description() const
-{
-	return "Mission Compiler Plugin";
-}
-
-QStringList MissionCompilerPlugin::dependencies() const
-{
-	QStringList list;
-	list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	//list.append("ObjectViewer");
-	return list;
 }
 
 void MissionCompilerPlugin::addAutoReleasedObject(QObject *obj)
 {
-	_plugMan->addObject(obj);
+	m_plugMan->addObject(obj);
-	_autoReleaseObjects.prepend(obj);
+	m_autoReleaseObjects.prepend(obj);
-}
-
-QObject* MissionCompilerPlugin::objectByName(const QString &name) const
-{
-	Q_FOREACH (QObject *qobj, _plugMan->allObjects())
-	if (qobj->objectName() == name)
-		return qobj;
-	return 0;
-}
-
-ExtensionSystem::IPluginSpec *MissionCompilerPlugin::pluginByName(const QString &name) const
-{
-	Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins())
-	if (spec->name() == name)
-		return spec;
-	return 0;
 }
 
 }

code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin.h

@@ -37,26 +37,16 @@ public:
 
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void addAutoReleasedObject(QObject *obj);
 
-	QObject *objectByName(const QString &name) const;
-	ExtensionSystem::IPluginSpec *pluginByName(const QString &name) const;
-
 protected:
-	NLMISC::CLibraryContext *_LibContext;
+	NLMISC::CLibraryContext *m_LibContext;
 
 private:
-	ExtensionSystem::IPluginManager *_plugMan;
+	ExtensionSystem::IPluginManager *m_plugMan;
-	QList<QObject *> _autoReleaseObjects;
+	QList<QObject *> m_autoReleaseObjects;
 };
 
 class CMissionCompilerContext: public Core::IContext

code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_mission_compiler</library-name>
+    <name>MissionCompiler</name>
+    <version>0.1</version>
+    <vendor>Ryzom Core</vendor>
+    <description>Mission Compiler Plugin</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

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

@@ -52,7 +52,7 @@
 #include "object_viewer_constants.h"
 
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../core/core_constants.h"
 
 using namespace std;
@@ -259,7 +259,7 @@ void CMainWindow::createActions()
 
 void CMainWindow::createMenus()
 {
-	Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager();
+	Core::MenuManager *menuManager = Core::ICore::instance()->menuManager();
 
 	_openAction = menuManager->action(Core::Constants::OPEN);
 

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

@@ -22,76 +22,76 @@ namespace NLQT
 {
 namespace Constants
 {
-const char * const OBJECT_VIEWER_PLUGIN	= "ObjectViewer";
+const char *const OBJECT_VIEWER_PLUGIN	= "ObjectViewer";
 
 //mainwindow
-const char * const MAIN_WINDOW = "ObjectViewer.MainWindow";
+const char *const MAIN_WINDOW = "ObjectViewer.MainWindow";
 
 //settings
-const char * const OBJECT_VIEWER_SECTION = "ObjectViewer";
+const char *const OBJECT_VIEWER_SECTION = "ObjectViewer";
-const char * const GRAPHICS_DRIVER = "GraphicsDriver";
+const char *const GRAPHICS_DRIVER = "GraphicsDriver";
-const char * const ENABLE_BLOOM = "EnableBloom";
+const char *const ENABLE_BLOOM = "EnableBloom";
-const char * const ENABLE_SQUARE_BLOOM = "EnableSquareBloom";
+const char *const ENABLE_SQUARE_BLOOM = "EnableSquareBloom";
-const char * const BLOOM_DENSITY  = "BloomDensity";
+const char *const BLOOM_DENSITY  = "BloomDensity";
-const char * const QT_STYLE  = "QtStyle";
+const char *const QT_STYLE  = "QtStyle";
-const char * const QT_PALETTE  = "QtPalette";
+const char *const QT_PALETTE  = "QtPalette";
-const char * const FONT  = "Font";
+const char *const FONT  = "Font";
 
-const char * const SOUND_ENABLE = "SoundEnable";
+const char *const SOUND_ENABLE = "SoundEnable";
-const char * const SOUND_DRIVER = "SoundDriver";
+const char *const SOUND_DRIVER = "SoundDriver";
-const char * const SOUND_DEVICE = "SoundDevice";
+const char *const SOUND_DEVICE = "SoundDevice";
-const char * const SOUND_AUTO_LOAD_SAMPLE = "SoundAutoLoadSample";
+const char *const SOUND_AUTO_LOAD_SAMPLE = "SoundAutoLoadSample";
-const char * const SOUND_ENABLE_OCCLUDE_OBSTRUCT = "SoundEnableOccludeObstruct";
+const char *const SOUND_ENABLE_OCCLUDE_OBSTRUCT = "SoundEnableOccludeObstruct";
-const char * const SOUND_ENABLE_REVERB = "SoundEnableReverb";
+const char *const SOUND_ENABLE_REVERB = "SoundEnableReverb";
-const char * const SOUND_MANUAL_ROLL_OFF = "SoundManualRolloff";
+const char *const SOUND_MANUAL_ROLL_OFF = "SoundManualRolloff";
-const char * const SOUND_FORCE_SOFTWARE = "SoundForceSoftware";
+const char *const SOUND_FORCE_SOFTWARE = "SoundForceSoftware";
-const char * const SOUND_USE_ADCPM = "SoundUseADPCM";
+const char *const SOUND_USE_ADCPM = "SoundUseADPCM";
-const char * const SOUND_MAX_TRACK = "SoundMaxTrack";
+const char *const SOUND_MAX_TRACK = "SoundMaxTrack";
-const char * const SOUND_PACKED_SHEET_PATH = "SoundPackedSheetPath";
+const char *const SOUND_PACKED_SHEET_PATH = "SoundPackedSheetPath";
-const char * const SOUND_SAMPLE_PATH = "SoundSamplePath";
+const char *const SOUND_SAMPLE_PATH = "SoundSamplePath";
 
-const char * const VEGET_TILE_BANK = "VegetTileBank";
+const char *const VEGET_TILE_BANK = "VegetTileBank";
-const char * const VEGET_TILE_FAR_BANK = "VegetTileFarBank";
+const char *const VEGET_TILE_FAR_BANK = "VegetTileFarBank";
-const char * const VEGET_TEXTURE = "VegetTexture";
+const char *const VEGET_TEXTURE = "VegetTexture";
-const char * const VEGET_LANDSCAPE_ZONES = "VegetLandscapeZones";
+const char *const VEGET_LANDSCAPE_ZONES = "VegetLandscapeZones";
-const char * const COARSE_MESH_TEXTURE = "CoarseMeshTexture";
+const char *const COARSE_MESH_TEXTURE = "CoarseMeshTexture";
 
-const char * const ICON_ADD_ITEM = ":/icons/ic_nel_add_item.png";
+const char *const ICON_ADD_ITEM = ":/icons/ic_nel_add_item.png";
-const char * const ICON_INSERT_ITEM = ":/icons/ic_nel_insert_item.png";
+const char *const ICON_INSERT_ITEM = ":/icons/ic_nel_insert_item.png";
-const char * const ICON_DELETE_ITEM = ":/icons/ic_nel_delete_item.png";
+const char *const ICON_DELETE_ITEM = ":/icons/ic_nel_delete_item.png";
-const char * const ICON_DOWN_ITEM = ":/icons/ic_nel_down_item.png";
+const char *const ICON_DOWN_ITEM = ":/icons/ic_nel_down_item.png";
-const char * const ICON_UP_ITEM = ":/icons/ic_nel_up_item.png";
+const char *const ICON_UP_ITEM = ":/icons/ic_nel_up_item.png";
-const char * const ICON_CAMERA_ADD = ":/icons/ic_nel_camera_add.png";
+const char *const ICON_CAMERA_ADD = ":/icons/ic_nel_camera_add.png";
-const char * const ICON_CAMERA_DEL = ":/icons/ic_nel_camera_del.png";
+const char *const ICON_CAMERA_DEL = ":/icons/ic_nel_camera_del.png";
-const char * const ICON_CAMERA_3DEDIT = ":/icons/ic_nel_camera_3dedit.png";
+const char *const ICON_CAMERA_3DEDIT = ":/icons/ic_nel_camera_3dedit.png";
-const char * const ICON_CAMERA_FPS = ":/icons/ic_nel_camera_fps.png";
+const char *const ICON_CAMERA_FPS = ":/icons/ic_nel_camera_fps.png";
-const char * const ICON_RESET_CAMERA = ":/icons/ic_nel_reset_camera.png";
+const char *const ICON_RESET_CAMERA = ":/icons/ic_nel_reset_camera.png";
-const char * const ICON_ANIM = ":/icons/ic_nel_anim.png";
+const char *const ICON_ANIM = ":/icons/ic_nel_anim.png";
-const char * const ICON_ANIMSET = ":/icons/ic_nel_animset.png";
+const char *const ICON_ANIMSET = ":/icons/ic_nel_animset.png";
-const char * const ICON_BGCOLOR = ":/icons/ic_nel_bgcolor.png";
+const char *const ICON_BGCOLOR = ":/icons/ic_nel_bgcolor.png";
-const char * const ICON_DAYNIGHT = ":/icons/ic_nel_daynight.png";
+const char *const ICON_DAYNIGHT = ":/icons/ic_nel_daynight.png";
-const char * const ICON_FRAMEDELAY = ":/icons/ic_nel_framedelay.png";
+const char *const ICON_FRAMEDELAY = ":/icons/ic_nel_framedelay.png";
-const char * const ICON_MIXER = ":/icons/ic_nel_mixer.png";
+const char *const ICON_MIXER = ":/icons/ic_nel_mixer.png";
-const char * const ICON_MRM_MESH = ":/icons/ic_nel_mrm_mesh.png";
+const char *const ICON_MRM_MESH = ":/icons/ic_nel_mrm_mesh.png";
-const char * const ICON_PARTICLES = ":/icons/ic_nel_particles.png";
+const char *const ICON_PARTICLES = ":/icons/ic_nel_particles.png";
-const char * const ICON_SKELSCALE = ":/icons/ic_nel_skelscale.png";
+const char *const ICON_SKELSCALE = ":/icons/ic_nel_skelscale.png";
-const char * const ICON_VEGET = ":/icons/ic_nel_veget.png";
+const char *const ICON_VEGET = ":/icons/ic_nel_veget.png";
-const char * const ICON_VEGETSET = ":/icons/ic_nel_vegetset.png";
+const char *const ICON_VEGETSET = ":/icons/ic_nel_vegetset.png";
-const char * const ICON_WATER = ":/icons/ic_nel_water.png";
+const char *const ICON_WATER = ":/icons/ic_nel_water.png";
-const char * const ICON_WIND = ":/icons/ic_nel_wind.png";
+const char *const ICON_WIND = ":/icons/ic_nel_wind.png";
 
-const char * const ICON_COLLISION_ZONE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_collision_zone_item_24.png";
+const char *const ICON_COLLISION_ZONE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_collision_zone_item_24.png";
-const char * const ICON_EMITTER_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_emitter_item_24.png";
+const char *const ICON_EMITTER_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_emitter_item_24.png";
-const char * const ICON_FORCE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_force_item_24.png";
+const char *const ICON_FORCE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_force_item_24.png";
-const char * const ICON_INSTANCE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_instance_item_24.png";
+const char *const ICON_INSTANCE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_instance_item_24.png";
-const char * const ICON_LIGHT_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_light_item_24.png";
+const char *const ICON_LIGHT_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_light_item_24.png";
-const char * const ICON_LOCATED_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_located_item_24.png";
+const char *const ICON_LOCATED_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_located_item_24.png";
-const char * const ICON_PARTICLE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_particle_item_24.png";
+const char *const ICON_PARTICLE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_particle_item_24.png";
-const char * const ICON_PARTICLE_SYSTEM_SMALL = ":/icons/particles_system_24/ic_nel_particle_system_24.png";
+const char *const ICON_PARTICLE_SYSTEM_SMALL = ":/icons/particles_system_24/ic_nel_particle_system_24.png";
-const char * const ICON_PARTICLE_SYSTEM_CLOSE_SMALL = ":/icons/particles_system_24/ic_nel_particle_system_close_24.png";
+const char *const ICON_PARTICLE_SYSTEM_CLOSE_SMALL = ":/icons/particles_system_24/ic_nel_particle_system_close_24.png";
-const char * const ICON_PARTICLES_SMALL = ":/icons/particles_system_24/ic_nel_particles_24.png";
+const char *const ICON_PARTICLES_SMALL = ":/icons/particles_system_24/ic_nel_particles_24.png";
-const char * const ICON_SOUND_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_sound_item_24.png";
+const char *const ICON_SOUND_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_sound_item_24.png";
-const char * const ICON_WORKSPACE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_workspace_item_24.png";
+const char *const ICON_WORKSPACE_ITEM_SMALL = ":/icons/particles_system_24/ic_nel_workspace_item_24.png";
 
 } // namespace Constants
 } // namespace NLQT

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

@@ -56,33 +56,6 @@ void ObjectViewerPlugin::setNelContext(NLMISC::INelContext *nelContext)
 	_LibContext = new NLMISC::CLibraryContext(*nelContext);
 }
 
-QString ObjectViewerPlugin::name() const
-{
-	return "ObjectViewer";
-}
-
-QString ObjectViewerPlugin::version() const
-{
-	return "0.8";
-}
-
-QString ObjectViewerPlugin::vendor() const
-{
-	return Core::Constants::OVQT_VENDOR;
-}
-
-QString ObjectViewerPlugin::description() const
-{
-	return "Object Viewer plugin.";
-}
-
-QStringList ObjectViewerPlugin::dependencies() const
-{
-	QStringList list;
-	list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	return list;
-}
-
 void ObjectViewerPlugin::addAutoReleasedObject(QObject *obj)
 {
 	_plugMan->addObject(obj);

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

@@ -36,15 +36,8 @@ public:
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
 	void shutdown();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void addAutoReleasedObject(QObject *obj);
 
 protected:

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_object_viewer</library-name>
+    <name>ObjectViewer</name>
+    <version>0.8</version>
+    <vendor>Ryzom Core</vendor>
+    <description>Object Viewer plugin.</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

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

@@ -43,7 +43,7 @@ namespace NLQT
 class CLocatedItem: public QListWidgetItem
 {
 public:
-	CLocatedItem ( const QString & text, QListWidget *parent = 0, int type = UserType ):
+	CLocatedItem ( const QString &text, QListWidget *parent = 0, int type = UserType ):
 		QListWidgetItem(text, parent, type), _loc(NULL) {}
 
 	void setUserData(NL3D::CPSLocated *loc)

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

@@ -332,7 +332,7 @@ public:
 	/// Restick all objects, useful after loading
 	void restickAllObjects();
 
-	TNodeVect& getNodeList()
+	TNodeVect &getNodeList()
 	{
 		return _Nodes;
 	}

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

@@ -44,7 +44,7 @@ namespace NLQT
 class CLocatedBindableItem: public QListWidgetItem
 {
 public:
-	CLocatedBindableItem ( const QString & text, QListWidget * parent = 0, int type = UserType ):
+	CLocatedBindableItem ( const QString &text, QListWidget *parent = 0, int type = UserType ):
 		QListWidgetItem(text, parent, type), _lb(NULL) {}
 
 	void setUserData(NL3D::CPSLocatedBindable *loc)

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

@@ -190,7 +190,7 @@ NLSOUND::USource *CSoundSystem::create(const std::string &soundName)
 	return NULL;
 }
 
-void CSoundSystem::playAnimation(std::string& name, float lastTime, float curTime, NLSOUND::CSoundContext &context)
+void CSoundSystem::playAnimation(std::string &name, float lastTime, float curTime, NLSOUND::CSoundContext &context)
 {
 	if (_AnimManager == NULL)
 	{

code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_sheet_builder</library-name>
+    <name>SheetBuilder</name>
+    <version>1.0</version>
+    <vendor>kharvd</vendor>
+    <description>make_sheet_id equivalent</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp

@@ -19,7 +19,7 @@
 #include "sheetbuilderdialog.h"
 #include "sheetbuilderconfgdialog.h"
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../core/core_constants.h"
 
 // NeL includes
@@ -38,14 +38,14 @@ using namespace Plugin;
 bool SheetBuilderPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
 {
 	Q_UNUSED(errorString);
-	_plugMan = pluginManager;
+	m_plugMan = pluginManager;
 
 	return true;
 }
 
 void SheetBuilderPlugin::extensionsInitialized()
 {
-	Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager();
+	Core::MenuManager *menuManager = Core::ICore::instance()->menuManager();
 
 	QMenu *sheetMenu = menuManager->menu(Core::Constants::M_SHEET);
 	QAction *sheetBuilderAction = sheetMenu->addAction(tr("Sheet builder"));
@@ -69,34 +69,7 @@ void SheetBuilderPlugin::setNelContext(NLMISC::INelContext *nelContext)
 	// This only applies to platforms without PIC, e.g. Windows.
 	nlassert(!NLMISC::INelContext::isContextInitialised());
 #endif // NL_OS_WINDOWS
-	_LibContext = new NLMISC::CLibraryContext(*nelContext);
+	m_LibContext = new NLMISC::CLibraryContext(*nelContext);
-}
-
-QString SheetBuilderPlugin::name() const
-{
-	return "Sheet builder";
-}
-
-QString SheetBuilderPlugin::version() const
-{
-	return "1.0";
-}
-
-QString SheetBuilderPlugin::vendor() const
-{
-	return "kharvd";
-}
-
-QString SheetBuilderPlugin::description() const
-{
-	return "make_sheet_id equivalent";
-}
-
-QStringList SheetBuilderPlugin::dependencies() const
-{
-	QStringList list;
-	list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	return list;
 }
 
 Q_EXPORT_PLUGIN(SheetBuilderPlugin)

code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h

@@ -28,11 +28,6 @@ namespace NLMISC
 class CLibraryContext;
 }
 
-namespace ExtensionSystem
-{
-class IPluginSpec;
-}
-
 namespace Plugin
 {
 
@@ -43,25 +38,18 @@ class SheetBuilderPlugin : public QObject, public ExtensionSystem::IPlugin
 public:
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void buildSheet(bool clean);
 
 private Q_SLOTS:
 	void execBuilderDialog();
 
 protected:
-	NLMISC::CLibraryContext *_LibContext;
+	NLMISC::CLibraryContext *m_LibContext;
 
 private:
-	ExtensionSystem::IPluginManager *_plugMan;
+	ExtensionSystem::IPluginManager *m_plugMan;
 
 };
 

code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilder.h

@@ -54,7 +54,7 @@ union TFormId
 	}
 };
 
-bool operator<(const TFormId& fid1, const TFormId& fid2)
+bool operator<(const TFormId &fid1, const TFormId &fid2)
 {
 	return fid1.Id<fid2.Id;
 }
@@ -82,7 +82,7 @@ uint32 NbFilesDiscarded = 0;
 void addId( string fileName );
 
 // getFileType
-bool getFileType( string& fileName, string& fileType );
+bool getFileType( string &fileName, string &fileType );
 
 //-----------------------------------------------
 //	getFirstFreeFileTypeId
@@ -107,7 +107,7 @@ sint16 getFirstFreeFileTypeId()
 //	readFormId
 //
 //-----------------------------------------------
-void readFormId( string& outputFileName )
+void readFormId( string &outputFileName )
 {
 	CIFile f;
 	if( f.open( outputFileName ) )
@@ -315,7 +315,7 @@ void addId( string fileName )
 //	getFileType
 //
 //-----------------------------------------------
-bool getFileType( string& fileName, string& fileType )
+bool getFileType( string &fileName, string &fileType )
 {
 	fileType = CFile::getExtension(CFile::getFilename(fileName));
 	return !fileType.empty();

code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp

@@ -195,7 +195,7 @@ void SheetBuilderDialog::buildSheet()
 	for( it1 = IdToForm.begin(); it1 != IdToForm.end(); ++it1 )
 	{
 		string outputLine = " id: " + toString((*it1).first.Id) + " file: " + (*it1).second +"\n";
-		output.serialBuffer((uint8*)(const_cast<char*>(outputLine.data())),(uint)outputLine.size());
+		output.serialBuffer((uint8 *)(const_cast<char *>(outputLine.data())),(uint)outputLine.size());
 	}
 
 	displayInfo (tr("------------- results ----------------"));

code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml

@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_zone_painter</library-name>
+    <name>ZonePainter</name>
+    <version>0.0</version>
+    <vendor>Ryzom Core</vendor>
+    <description>Zone Painter Plugin</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>

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

@@ -11,7 +11,7 @@
 #include "painter_dock_widget.h"
 
 #include "../core/icore.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../core/core_constants.h"
 
 ZonePainterMainWindow::ZonePainterMainWindow(QWidget *parent) :
@@ -145,6 +145,7 @@ void ZonePainterMainWindow::loadConfig() {
 
 	QColor color;
 	color = settings->value("BackgroundColor", QColor(80, 80, 80)).value<QColor>();
+	settings->endGroup();
 	m_nelWidget->setBackgroundColor(NLMISC::CRGBA(color.red(), color.green(), color.blue(), color.alpha()));
 }
 

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

@@ -3,7 +3,7 @@
 #include "zone_painter_settings_page.h"
 #include "../core/icore.h"
 #include "../core/core_constants.h"
-#include "../core/imenu_manager.h"
+#include "../core/menu_manager.h"
 #include "../../extension_system/iplugin_spec.h"
 
 // NeL includes
@@ -19,22 +19,22 @@
 
 namespace Plugin
 {
-	NLMISC_SAFE_SINGLETON_IMPL(CZoneManager)
+//	NLMISC_SAFE_SINGLETON_IMPL(CZoneManager)
 
 ZonePainterPlugin::~ZonePainterPlugin()
 {
-	Q_FOREACH(QObject *obj, _autoReleaseObjects)
+	Q_FOREACH(QObject *obj, m_autoReleaseObjects)
 	{
-		_plugMan->removeObject(obj);
+		m_plugMan->removeObject(obj);
 	}
-	qDeleteAll(_autoReleaseObjects);
+	qDeleteAll(m_autoReleaseObjects);
-	_autoReleaseObjects.clear();
+	m_autoReleaseObjects.clear();
 }
 
 bool ZonePainterPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
 {
 	Q_UNUSED(errorString);
-	_plugMan = pluginManager;
+	m_plugMan = pluginManager;
 
 	addAutoReleasedObject(new CZonePainterSettingsPage(this));
 	addAutoReleasedObject(new CZonePainterContext(this));
@@ -45,19 +45,7 @@ bool ZonePainterPlugin::initialize(ExtensionSystem::IPluginManager *pluginManage
 void ZonePainterPlugin::extensionsInitialized()
 {
 	Core::ICore *core = Core::ICore::instance();
-	Core::IMenuManager *menuManager = core->menuManager();
+	Core::MenuManager *menuManager = core->menuManager();
-	//menuManager = _plugMan->getObject<Core::IMenuManager>();
-	QAction *exampleAction1 = new QAction("Zone1", this);
-	QAction *exampleAction2 = new QAction("Zone2", this);
-	QAction *aboutQtAction = menuManager->action(Core::Constants::ABOUT_QT);
-	QMenu *helpMenu = menuManager->menu(Core::Constants::M_HELP);
-	helpMenu->insertAction(aboutQtAction, exampleAction1);
-	helpMenu->addSeparator();
-	helpMenu->addAction(exampleAction2);
-	QMenu *zoneMenu = menuManager->menuBar()->addMenu("ZoneMenu");
-	zoneMenu->insertAction(aboutQtAction, exampleAction1);
-	zoneMenu->addSeparator();
-	zoneMenu->addAction(exampleAction2);
 }
 
 void ZonePainterPlugin::setNelContext(NLMISC::INelContext *nelContext)
@@ -67,57 +55,13 @@ void ZonePainterPlugin::setNelContext(NLMISC::INelContext *nelContext)
 	// This only applies to platforms without PIC, e.g. Windows.
 	nlassert(!NLMISC::INelContext::isContextInitialised());
 #endif // NL_OS_WINDOWS
-	_LibContext = new NLMISC::CLibraryContext(*nelContext);
+	m_LibContext = new NLMISC::CLibraryContext(*nelContext);
-}
-
-QString ZonePainterPlugin::name() const
-{
-	return "ZonePainterPlugin";
-}
-
-QString ZonePainterPlugin::version() const
-{
-	return "0.2";
-}
-
-QString ZonePainterPlugin::vendor() const
-{
-	return "Ryzom Core";
-}
-
-QString ZonePainterPlugin::description() const
-{
-	return "Zone Painter Plugin";
-}
-
-QStringList ZonePainterPlugin::dependencies() const
-{
-	QStringList list;
-	list.append(Core::Constants::OVQT_CORE_PLUGIN);
-	//list.append("ObjectViewer");
-	return list;
 }
 
 void ZonePainterPlugin::addAutoReleasedObject(QObject *obj)
 {
-	_plugMan->addObject(obj);
+	m_plugMan->addObject(obj);
-	_autoReleaseObjects.prepend(obj);
+	m_autoReleaseObjects.prepend(obj);
-}
-
-QObject* ZonePainterPlugin::objectByName(const QString &name) const
-{
-	Q_FOREACH (QObject *qobj, _plugMan->allObjects())
-	if (qobj->objectName() == name)
-		return qobj;
-	return 0;
-}
-
-ExtensionSystem::IPluginSpec *ZonePainterPlugin::pluginByName(const QString &name) const
-{
-	Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins())
-	if (spec->name() == name)
-		return spec;
-	return 0;
 }
 
 }

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

@@ -31,7 +31,7 @@ class IPluginSpec;
 namespace Plugin
 {
 
-	class CZoneManager 
+/*	class CZoneManager 
 	{
 		NLMISC_SAFE_SINGLETON_DECL(CZoneManager)
 	public:
@@ -41,7 +41,7 @@ namespace Plugin
 		NL3D::CLandscapeModel *m_painterLandscape;
 		NL3D::CZone *m_currentZone;
 	};
-
+*/
 class ZonePainterPlugin : public QObject, public ExtensionSystem::IPlugin
 {
 	Q_OBJECT
@@ -52,28 +52,16 @@ public:
 
 	bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
 	void extensionsInitialized();
-
 	void setNelContext(NLMISC::INelContext *nelContext);
 
-	QString name() const;
-	QString version() const;
-	QString vendor() const;
-	QString description() const;
-	QStringList dependencies() const;
-
 	void addAutoReleasedObject(QObject *obj);
 
-	QObject *objectByName(const QString &name) const;
-	ExtensionSystem::IPluginSpec *pluginByName(const QString &name) const;
-
-
-
 protected:
-	NLMISC::CLibraryContext *_LibContext;
+	NLMISC::CLibraryContext *m_LibContext;
 
 private:
-	ExtensionSystem::IPluginManager *_plugMan;
+	ExtensionSystem::IPluginManager *m_plugMan;
-	QList<QObject *> _autoReleaseObjects;
+	QList<QObject *> m_autoReleaseObjects;
 };
 
 class CZonePainterContext: public Core::IContext

code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp

@@ -2587,9 +2587,10 @@ bool CExportNel::calculateLM( CMesh::CMeshBuild *pZeMeshBuild, CMeshBase::CMeshB
 						string sLMName = sBaseName + NLMISC::toString(i) + ".tga";
 						if (CFile::fileExists(sLMName))
 						{
+							nlinfo("DELETE %s",  sLMName.c_str());
 							if (!CFile::deleteFile(sLMName))
 							{
-								nlwarning("Failed to delete file %s.", sLMName.c_str());
+								nlwarning("Failed to delete file %s", sLMName.c_str());
 							}
 						}
 					}
@@ -2608,6 +2609,7 @@ bool CExportNel::calculateLM( CMesh::CMeshBuild *pZeMeshBuild, CMeshBase::CMeshB
 				COFile f( sSaveName );
 				try
 				{
+					nlinfo("SAVE %s", sSaveName.c_str());
 					if (lmcEnabled)
 					{
 						// In fact the output is 32 bits because we need the alpha channel

code/nel/tools/build_gamedata/6_client_patch.py

@@ -24,9 +24,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 
-import time, sys, os, shutil, subprocess, distutils.dir_util
+import time, sys, os, shutil, subprocess, distutils.dir_util, argparse
 sys.path.append("configuration")
 
+parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Client Patch')
+parser.add_argument('--bnponly', '-bo', action='store_true')
+args = parser.parse_args()
+
 if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
@@ -59,56 +63,57 @@ printLog(log, "")
 
 if BnpMake == "":
 	toolLogFail(log, BnpMakeTool, ToolSuffix)
-elif PatchGen == "":
+elif PatchGen == "" and not args.bnponly:
 	toolLogFail(log, PatchGenTool, ToolSuffix)
-elif Lzma == "":
+elif Lzma == "" and not args.bnponly:
 	toolLogFail(log, "LZMA", ToolSuffix)
-elif XDelta == "":
+elif XDelta == "" and not args.bnponly:
 	toolLogFail(log, "XDELTA", ToolSuffix)
 elif os.path.dirname(Lzma) != os.path.dirname(XDelta):
 	printLog(log, "FAIL lzma.exe and xdelta.exe must be in the same directory")
 else:
 	mkPath(log, ClientPatchDirectory)
-	productXml = ClientPatchDirectory + "/" + ProductName + ".xml"
+	if not args.bnponly:
-	if not os.path.isfile(productXml):
+		productXml = ClientPatchDirectory + "/" + ProductName + ".xml"
-		printLog(log, ">>> Create new product <<<")
+		if not os.path.isfile(productXml):
-		subprocess.call([ PatchGen, "createNewProduct", productXml ])
+			printLog(log, ">>> Create new product <<<")
-	printLog(log, "")
+			subprocess.call([ PatchGen, "createNewProduct", productXml ])
-	printLog(log, ">>> Rewrite " + ProductName + ".xml <<<") # because we know better.
+		printLog(log, "")
-	shutil.move(productXml, productXml + ".old")
+		printLog(log, ">>> Rewrite " + ProductName + ".xml <<<") # because we know better.
-	oldCfg = open(productXml + ".old", "r")
+		shutil.move(productXml, productXml + ".old")
-	cfg = open(productXml, "w")
+		oldCfg = open(productXml + ".old", "r")
-	inCategories = 0
+		cfg = open(productXml, "w")
-	for line in oldCfg:
+		inCategories = 0
-		if not inCategories:
+		for line in oldCfg:
-			if line.strip() == "<_Categories>":
+			if not inCategories:
-				inCategories = 1
+				if line.strip() == "<_Categories>":
-				cfg.write("\t<_Categories>\n")
+					inCategories = 1
-				for category in InstallClientData:
+					cfg.write("\t<_Categories>\n")
-					cfg.write("\t\t<_Category>\n")
+					for category in InstallClientData:
-					cfg.write("\t\t\t<_Name type=\"STRING\" value=\"" + category["Name"] + "\"/>\n")
+						cfg.write("\t\t<_Category>\n")
-					if category["UnpackTo"] != None:
+						cfg.write("\t\t\t<_Name type=\"STRING\" value=\"" + category["Name"] + "\"/>\n")
-						if category["UnpackTo"] != "":
+						if category["UnpackTo"] != None:
-							cfg.write("\t\t\t<_UnpackTo type=\"STRING\" value=\"./" + category["UnpackTo"] + "/\"/>\n")
+							if category["UnpackTo"] != "":
-						else:
+								cfg.write("\t\t\t<_UnpackTo type=\"STRING\" value=\"./" + category["UnpackTo"] + "/\"/>\n")
-							cfg.write("\t\t\t<_UnpackTo type=\"SINT32\" value=\"./\"/>\n")
+							else:
-					cfg.write("\t\t\t<_IsOptional type=\"SINT32\" value=\"" + str(category["IsOptional"]) + "\"/>\n")
+								cfg.write("\t\t\t<_UnpackTo type=\"SINT32\" value=\"./\"/>\n")
-					cfg.write("\t\t\t<_IsIncremental type=\"SINT32\" value=\"" + str(category["IsIncremental"]) + "\"/>\n")
+						cfg.write("\t\t\t<_IsOptional type=\"SINT32\" value=\"" + str(category["IsOptional"]) + "\"/>\n")
-					for package in category["Packages"]:
+						cfg.write("\t\t\t<_IsIncremental type=\"SINT32\" value=\"" + str(category["IsIncremental"]) + "\"/>\n")
-						if (len(package[1]) > 0):
+						for package in category["Packages"]:
-							cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + package[1][0] + "\"/>\n")
+							if (len(package[1]) > 0):
-						else:
+								cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + package[1][0] + "\"/>\n")
-							cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + package[0] + ".bnp\"/>\n")
+							else:
-					cfg.write("\t\t</_Category>\n")
+								cfg.write("\t\t\t<_Files type=\"STRING\" value=\"" + package[0] + ".bnp\"/>\n")
-				cfg.write("\t</_Categories>\n")
+						cfg.write("\t\t</_Category>\n")
+					cfg.write("\t</_Categories>\n")
+				else:
+					cfg.write(line)
 			else:
-				cfg.write(line)
+				if line.strip() == "</_Categories>":
-		else:
+					inCategories = 0
-			if line.strip() == "</_Categories>":
+		oldCfg.close()
-				inCategories = 0
+		cfg.close()
-	oldCfg.close()
+		os.remove(productXml + ".old")
-	cfg.close()
-	os.remove(productXml + ".old")
 	printLog(log, "")
 	printLog(log, ">>> Make bnp <<<")
 	targetPath = ClientPatchDirectory + "/bnp"
@@ -133,13 +138,14 @@ else:
 			else:
 				printLog(log, "SKIP " + targetBnp)
 	printLog(log, "")
-	printLog(log, ">>> Update product <<<")
+	if not args.bnponly:
-	cwDir = os.getcwd().replace("\\", "/")
+		printLog(log, ">>> Update product <<<")
-	toolDir = os.path.dirname(Lzma).replace("\\", "/")
+		cwDir = os.getcwd().replace("\\", "/")
-	os.chdir(toolDir)
+		toolDir = os.path.dirname(Lzma).replace("\\", "/")
-	subprocess.call([ PatchGen, "updateProduct", productXml ])
+		os.chdir(toolDir)
-	os.chdir(cwDir)
+		subprocess.call([ PatchGen, "updateProduct", productXml ])
-	printLog(log, "")
+		os.chdir(cwDir)
+		printLog(log, "")
 
 
 log.close()

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

@@ -0,0 +1,177 @@
+#!/usr/bin/python
+# 
+# \file 8_upload.py
+# \brief Upload data to servers
+# \date 2009-02-18 16:19GMT
+# \author Jan Boon (Kaetemi)
+# Game data build pipeline.
+# Upload data to servers
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2011  Kaetemi
+#
+# 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/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from tools import *
+
+try:
+	from upload import *
+except ImportError:
+	# Not documenting this. Because we can.
+	printLog(log, "ERROR Upload not configured, bye.")
+	exit()
+
+sys.path.append(WorkspaceDirectory)
+from projects import *
+
+# Log error
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Upload data to servers")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+# Not documenting this. Because we can.
+Psftp = findFileMultiDir(log, ToolDirectories + WindowsExeDllCfgDirectories, UploadPsftpTool)
+printLog(log, "PSFTP " + Psftp)
+
+def downloadVersionTag(server, user, dir):
+	if os.path.isfile("upload.tag"):
+		os.remove("upload.tag")
+	if os.path.isfile("upload.batch"):
+		os.remove("upload.batch")
+	ub = open("upload.batch", "w")
+	ub.write("cd " + dir + "\n")
+	ub.write("get upload.tag upload.tag\n")
+	ub.write("quit\n")
+	ub.close()
+	subprocess.call([ Psftp, "-b", "upload.batch", user + "@" + server ])
+	os.remove("upload.batch")
+	if os.path.isfile("upload.tag"):
+		ft = open("upload.tag")
+		result = float(ft.read()) # float, really
+		ft.close()
+		os.remove("upload.tag")
+		printLog(log, "INFO Upload tag is " + str(result))
+		return result
+	else:
+		printLog(log, "WARNING Upload tag not found, uploading everything")
+		return 0
+
+def isDirectoryNeeded(ft, dir):
+	files = os.listdir(dir)
+	for fileName in files:
+		if isLegalFileName(fileName):
+			fileFull = dir + "/" + fileName
+			if os.path.isfile(fileFull):
+				nftf = os.stat(fileFull).st_mtime
+				if nftf > ft:
+					return True
+			elif os.path.isdir(fileFull):
+				if isDirectoryNeeded(ft, fileFull):
+					return True
+			elif not os.path.isdir(fileFull):
+				printLog(log, "isDirectoryNeeded: file not dir or file?!" + fileFull)
+	return False
+
+def listDirectoryUpload(ft, ub, udb, dir):
+	nft = 0
+	files = os.listdir(dir)
+	for fileName in files:
+		if isLegalFileName(fileName):
+			fileFull = dir + "/" + fileName
+			if os.path.isfile(fileFull):
+				nftf = os.stat(fileFull).st_mtime
+				if nftf > ft:
+					ub.write("put " + fileFull + " " + fileName + "\n")
+				if nftf > nft:
+					nft = nftf
+			elif os.path.isdir(fileFull):
+				if isDirectoryNeeded(ft, fileFull):
+					udb.write("mkdir " + fileName + "\n")
+					ub.write("cd " + fileName + "\n")
+					udb.write("cd " + fileName + "\n")
+					nft2 = listDirectoryUpload(ft, ub, udb, fileFull)
+					if (nft2 > nft):
+						nft = nft2
+					ub.write("cd ..\n")
+					udb.write("cd ..\n")
+			elif not os.path.isdir(fileFull):
+				printLog(log, "listDirectoryUpload: file not dir or file?!" + fileFull)
+	return nft
+
+def uploadSftp(server, user, dir_to, dir_from, addcmd):
+	ft = downloadVersionTag(server, user, dir_to)
+	if isDirectoryNeeded(ft, dir_from):
+		if os.path.isfile("upload_dir.batch"):
+			os.remove("upload_dir.batch")
+		if os.path.isfile("upload.batch"):
+			os.remove("upload.batch")
+		udb = open("upload_dir.batch", "w")
+		udb.write("cd " + dir_to + "\n")
+		ub = open("upload.batch", "w")
+		ub.write("cd " + dir_to + "\n")
+		for ac in addcmd:
+			ub.write(ac + "\n")
+		ftn = listDirectoryUpload(ft, ub, udb, dir_from)
+		if (ft > ftn):
+			ftn = ft
+		nft = open("upload.tag", "w")
+		nft.write(str(ftn))
+		nft.close()
+		ub.write("put upload.tag upload.tag\n")
+		ub.write("quit\n")
+		ub.close()
+		udb.write("quit\n")
+		udb.close()
+		subprocess.call([ Psftp, "-be", "-b", "upload_dir.batch", user + "@" + server ])
+		subprocess.call([ Psftp, "-b", "upload.batch", user + "@" + server ])
+		os.remove("upload_dir.batch")
+		os.remove("upload.batch")
+		os.remove("upload.tag")
+	else:
+		printLog(log, "SKIP " + dir_to)
+
+printLog(log, ">>> Upload patch <<<")
+for target in UploadPatch:
+	uploadSftp(target[0], target[1], 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" ])
+
+printLog(log, ">>> Upload data_common <<<")
+for target in UploadCommon:
+	uploadSftp(target[0], target[1], target[3], DataCommonDirectory, [ ])
+
+printLog(log, ">>> Upload data_leveldesign <<<")
+for target in UploadLeveldesign:
+	uploadSftp(target[0], target[1], target[3], LeveldesignDirectory, [ ])
+
+log.close()
+if os.path.isfile("8_upload.log"):
+	os.remove("8_upload.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_upload.log")
+shutil.move("log.log", "8_upload.log")

code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py

@@ -1,16 +1,7 @@
 
 
-printLog(log, ">>> List %PreGenFileExtension% <<<")
+# Remove bad file from previous script version
-outDirPacsPrim =  ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
-mkPath(log, outDirPacsPrim)
 listPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable% + "/landscape_col_prim_pacs_list.txt"
 if os.path.isfile(listPath):
 	os.remove(listPath)
-if WantLandscapeColPrimPacsList:
-	exportedPacsPrims = findFiles(log, outDirPacsPrim, "", ".%PreGenFileExtension%")
-	printLog(log, "WRITE " + listPath)
-	listFile = open(listPath, "w")
-	for exported in exportedPacsPrims:
-		listFile.write(exported + "\n")
-	listFile.close()
 

code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms

@@ -187,7 +187,7 @@ fn haveCoarseMesh node =
 	return false
 )
 
-fn runNelMaxExport inputMaxFile = 
+fn runNelMaxExportSub inputMaxFile retryCount = 
 (
 	tagThisFile = false
 	
@@ -354,8 +354,39 @@ fn runNelMaxExport inputMaxFile =
 	(
 		-- Error
 		nlerror("WARNING no shape exported from the file " + inputMaxFile)
+		if tagThisFile then
+		(
+			if retryCount < 2 then
+			(
+				nlerror("INFO retry this file")
+				
+				-- Free memory and file handles
+				gc()
+				heapfree
+				
+				-- Reset 3dsmax
+				resetMAXFile #noprompt
+				
+				if (loadMaxFile inputMaxFile quiet:true) == true then
+				(
+					tagThisFile = runNelMaxExportSub inputMaxFile (retryCount + 1)
+				)
+				else
+				(
+					-- Error
+					nlerror("ERROR exporting '%PreGenFileExtension%': can't open the file " + inputMaxFile)
+					nlerror("FAIL Mysterious error occured")
+					NelForceQuitRightNow()
+				)
+			)
+		)
 	)
 	
 	return tagThisFile
 )
 
+fn runNelMaxExport inputMaxFile = 
+(
+	return runNelMaxExportSub inputMaxFile 0
+)
+

code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms

@@ -90,7 +90,9 @@ try
 catch 
 (
 	-- Error
-	nlerror("ERROR fatal error exporting '%PreGenFileExtension%' in folder %MaxSourceDirectory%")
+	nlerror("ERROR Fatal error exporting '%PreGenFileExtension%' in folder %MaxSourceDirectory%")
+	nlerror("FAIL Fatal error occured")
+	NelForceQuitRightNow()
 	removeRunningTag = false
 )
 

code/nel/tools/build_gamedata/interface_dev.bat

@@ -0,0 +1,4 @@
+1_export.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+2_build.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+3_install.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+5_client_dev.py

code/nel/tools/build_gamedata/leveldesign_dev.bat

@@ -0,0 +1,4 @@
+1_export.py -ipj common/gamedev common/data_common common/leveldesign common/exedll common/cfg
+2_build.py -ipj common/gamedev common/data_common common/leveldesign common/exedll common/cfg
+3_install.py -ipj common/gamedev common/data_common common/leveldesign common/exedll common/cfg
+5_client_dev.py

code/nel/tools/build_gamedata/processes/anim/1_export.py

@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export anim
-# \date 2010-09-26-08-38-GMT
+# \date 2011-09-21-20-51-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export anim

code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms

@@ -224,7 +224,9 @@ try
 catch 
 (
 	-- Error
-	nlerror("ERROR fatal error exporting 'anim' in folder %MaxSourceDirectory%")
+	nlerror("ERROR Fatal error exporting 'anim' in folder %MaxSourceDirectory%")
+	nlerror("FAIL Fatal error occured")
+	NelForceQuitRightNow()
 	removeRunningTag = false
 )
 

code/nel/tools/build_gamedata/processes/clodbank/1_export.py

@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export clodbank
-# \date 2010-09-26-08-38-GMT
+# \date 2011-09-21-20-51-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export clodbank

code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms

@@ -279,7 +279,9 @@ try
 catch 
 (
 	-- Error
-	nlerror("ERROR fatal error exporting 'clod' in folder %MaxSourceDirectory%")
+	nlerror("ERROR Fatal error exporting 'clod' in folder %MaxSourceDirectory%")
+	nlerror("FAIL Fatal error occured")
+	NelForceQuitRightNow()
 	removeRunningTag = false
 )
 

code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms

@@ -328,7 +328,9 @@ try
 catch 
 (
 	-- Error
-	nlerror("ERROR fatal error exporting 'ig' in folder %MaxSourceDirectory%")
+	nlerror("ERROR Fatal error exporting 'ig' in folder %MaxSourceDirectory%")
+	nlerror("FAIL Fatal error occured")
+	NelForceQuitRightNow()
 	removeRunningTag = false
 )
 

code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py

@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export pacs_prim
-# \date 2010-09-19-14-19-GMT
+# \date 2011-09-28-07-42-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export pacs_prim
@@ -92,19 +92,10 @@ if MaxAvailable:
 
 
 
-printLog(log, ">>> List pacs_prim <<<")
+# Remove bad file from previous script version
-outDirPacsPrim =  ExportBuildDirectory + "/" + PacsPrimExportDirectory
-mkPath(log, outDirPacsPrim)
 listPath = ExportBuildDirectory + "/" + PacsPrimExportDirectory + "/landscape_col_prim_pacs_list.txt"
 if os.path.isfile(listPath):
 	os.remove(listPath)
-if WantLandscapeColPrimPacsList:
-	exportedPacsPrims = findFiles(log, outDirPacsPrim, "", ".pacs_prim")
-	printLog(log, "WRITE " + listPath)
-	listFile = open(listPath, "w")
-	for exported in exportedPacsPrims:
-		listFile.write(exported + "\n")
-	listFile.close()
 
 
 

code/nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py

@@ -0,0 +1,58 @@
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup pacs_prim_list
+# \date 2011-09-28 7:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup pacs_prim_list
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2010  Winch Gate Property Limited
+#
+# 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/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup pacs_prim_list")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup source directories
+printLog(log, ">>> Setup source directories <<<")
+for dir in PacsPrimExportSourceDirectories:
+	mkPath(log, ExportBuildDirectory + "/" + dir)
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+mkPath(log, DataCommonDirectory) # no choice
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py

@@ -0,0 +1,53 @@
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Export pacs_prim_list
+# \date 2011-09-28 7:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export pacs_prim_list
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2010  Winch Gate Property Limited
+#
+# 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/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export pacs_prim_list")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+printLog(log, ">>> Nothing to do! <<<")
+
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py

@@ -0,0 +1,63 @@
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build pacs_prim_list
+# \date 2011-09-28 7:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build pacs_prim_list
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2010  Winch Gate Property Limited
+#
+# 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/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build pacs_prim_list")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+printLog(log, ">>> List pacs_prim <<<")
+listPath = DataCommonDirectory + "/landscape_col_prim_pacs_list.txt"
+if os.path.isfile(listPath):
+	os.remove(listPath)
+listFile = open(listPath, "w")
+printLog(log, "WRITE " + listPath)
+for dir in PacsPrimExportSourceDirectories:
+	outDirPacsPrim = ExportBuildDirectory + "/" + dir
+	mkPath(log, outDirPacsPrim)
+	exportedPacsPrims = findFiles(log, outDirPacsPrim, "", ".pacs_prim")
+	for exported in exportedPacsPrims:
+		listFile.write(exported + "\n")
+listFile.close()
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py

@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install pacs_prim_list
+# \date 2011-09-28 7:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install pacs_prim_list
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2010  Winch Gate Property Limited
+#
+# 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/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install pacs_prim_list")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+printLog(log, ">>> Nothing to do! <<<")
+
+printLog(log, "")
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/rbank/1_export.py

@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export rbank
-# \date 2010-09-26-08-38-GMT
+# \date 2011-09-21-20-51-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export rbank

code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms

@@ -215,7 +215,9 @@ try
 catch 
 (
 	-- Error
-	nlerror("ERROR fatal error exporting 'cmb' in folder %MaxSourceDirectory%")
+	nlerror("ERROR Fatal error exporting 'cmb' in folder %MaxSourceDirectory%")
+	nlerror("FAIL Fatal error occured")
+	NelForceQuitRightNow()
 	removeRunningTag = false
 )
 

code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms

@@ -253,7 +253,7 @@ fn haveCoarseMesh node =
 	return false
 )
 
-fn runNelMaxExport inputMaxFile = 
+fn runNelMaxExportSub inputMaxFile retryCount = 
 (
 	tagThisFile = false
 	
@@ -420,11 +420,42 @@ fn runNelMaxExport inputMaxFile =
 	(
 		-- Error
 		nlerror("WARNING no shape exported from the file " + inputMaxFile)
+		if tagThisFile then
+		(
+			if retryCount < 2 then
+			(
+				nlerror("INFO retry this file")
+				
+				-- Free memory and file handles
+				gc()
+				heapfree
+				
+				-- Reset 3dsmax
+				resetMAXFile #noprompt
+				
+				if (loadMaxFile inputMaxFile quiet:true) == true then
+				(
+					tagThisFile = runNelMaxExportSub inputMaxFile (retryCount + 1)
+				)
+				else
+				(
+					-- Error
+					nlerror("ERROR exporting 'shape': can't open the file " + inputMaxFile)
+					nlerror("FAIL Mysterious error occured")
+					NelForceQuitRightNow()
+				)
+			)
+		)
 	)
 	
 	return tagThisFile
 )
 
+fn runNelMaxExport inputMaxFile = 
+(
+	return runNelMaxExportSub inputMaxFile 0
+)
+
 
 
 removeRunningTag = true
@@ -517,7 +548,9 @@ try
 catch 
 (
 	-- Error
-	nlerror("ERROR fatal error exporting 'shape' in folder %MaxSourceDirectory%")
+	nlerror("ERROR Fatal error exporting 'shape' in folder %MaxSourceDirectory%")
+	nlerror("FAIL Fatal error occured")
+	NelForceQuitRightNow()
 	removeRunningTag = false
 )
 

code/nel/tools/build_gamedata/processes/sheet_id/2_build.py

@@ -54,7 +54,7 @@ if MakeSheetId == "":
 else:
 	mkPath(log, LeveldesignDirectory)
 	mkPath(log, LeveldesignWorldDirectory)
-	subprocess.call([ MakeSheetId, "-o" + LeveldesignDirectory + "/game_elem/sheet_id.bin", LeveldesignDirectory + "/game_elem", LeveldesignDirectory + "/game_element", LeveldesignWorldDirectory ])
+	subprocess.call([ MakeSheetId, "-o" + LeveldesignDirectory + "/game_elem/sheet_id.bin", LeveldesignDirectory + "/game_elem", LeveldesignDirectory + "/game_element", LeveldesignWorldDirectory, DataShardDirectory + "mirror_sheets" ])
 printLog(log, "")
 
 log.close()

code/nel/tools/build_gamedata/processes/sheets/2_build.py

@@ -77,6 +77,8 @@ else:
 	cf.write("\n")
 	cf.close()
 	subprocess.call([ SheetsPacker ])
+	copyFileIfNeeded(log, "visual_slot.tab", DataCommonDirectory + "/visual_slot.tab")
+	os.remove("visual_slot.tab")
 printLog(log, "")
 
 log.close()