Changed: Added background color dialog to zone painter.

code/CMakeModules/CheckDepends.cmake

@@ -27,12 +27,17 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
       ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL})
     ENDIF(CMAKE_NM)
   ELSEIF(UNIX)
+    SET(CMAKE_OBJDUMP objdump)
     IF(CMAKE_OBJDUMP)
       # Use objdump to check if a library is using an external symbol
+      #MESSAGE(STATUS "exec ${CMAKE_OBJDUMP} -T ${${MYLIBRARY}} | grep ${SYMBOL}")
       EXEC_PROGRAM(${CMAKE_OBJDUMP} ARGS "-T ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE OBJDUMP_SYMBOL)
-      IF(OBJDUMP_SYMBOL MATCHES "UND")
+      IF(NOT OBJDUMP_SYMBOL MATCHES "UND")
+        #MESSAGE(STATUS "${${MYLIBRARY}} does not use symbol ${SYMBOL}")
         SET(${SYMBOL_FOUND} FALSE)
-      ENDIF(OBJDUMP_SYMBOL MATCHES "UND")
+      ELSE(NOT OBJDUMP_SYMBOL MATCHES "UND")
+        #MESSAGE(STATUS "${${MYLIBRARY}} uses symbol ${SYMBOL}")
+      ENDIF(NOT OBJDUMP_SYMBOL MATCHES "UND")
     ENDIF(CMAKE_OBJDUMP)
   ENDIF(WIN32)
 ENDMACRO(CHECK_UNDEFINED_SYMBOL)
@@ -64,14 +69,19 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
       ENDIF(OTOOL_LIBRARY MATCHES "${LIBNAME}")
     ENDIF(CMAKE_OTOOL)
   ELSEIF(UNIX)
+    SET(CMAKE_OBJDUMP objdump)
     IF(CMAKE_OBJDUMP)
       GET_FILENAME_COMPONENT(LIBNAME "${${OTHERLIBRARY}}" NAME)
       # TODO: under Solaris use dump -Lv <lib>
       # Use objdump to check if a library is linked to another library
+      #MESSAGE(STATUS "exec ${CMAKE_OBJDUMP} -p ${${MYLIBRARY}} | grep ${LIBNAME}")
       EXEC_PROGRAM(${CMAKE_OBJDUMP} ARGS "-p ${${MYLIBRARY}} | grep ${LIBNAME}" OUTPUT_VARIABLE OBJDUMP_LIBRARY)
-      IF(NOT OBJDUMP_LIBRARY MATCHES "NEEDED")
+      IF(OBJDUMP_LIBRARY MATCHES "NEEDED")
+        #MESSAGE(STATUS "${${MYLIBRARY}} references to ${LIBNAME}.")
         SET(${LIBRARY_FOUND} TRUE)
-      ENDIF(NOT OBJDUMP_LIBRARY MATCHES "NEEDED")
+      ELSE(OBJDUMP_LIBRARY MATCHES "NEEDED")
+        #MESSAGE(STATUS "${${MYLIBRARY}} does not reference to ${LIBNAME}!")
+      ENDIF(OBJDUMP_LIBRARY MATCHES "NEEDED")
     ENDIF(CMAKE_OBJDUMP)
   ENDIF(WIN32)
 ENDMACRO(CHECK_LINKED_LIBRARY)
@@ -125,3 +135,4 @@ MACRO(LINK_DEPENDS LIBRARIES MYLIBRARY OTHERLIBRARY SYMBOL)
     SET(${OTHERLIBRARY}_LINKED TRUE)
   ENDIF(MUST_LINK)
 ENDMACRO(LINK_DEPENDS)
+

code/README

@@ -1,10 +1,10 @@
 Introduction
 ------------
 
-NeL is a software platform for creating and running massively multi-user
+Ryzom Core is a software platform for creating and running massively multi-user
 entertainment in a 3D environment over the Internet.
 
-The NeL library is further divided into specific modules: network, ai, 3d
+The Ryzom Core library is further divided into specific modules: network, ai, 3d
 and misc. If you want to use any of these, you also need to use the misc
 part of the library, but ai, 3d and network are totally independant from
 each other so you can use only the parts you really need in your project.
@@ -12,14 +12,14 @@ each other so you can use only the parts you really need in your project.
 If you want know more about the library content and functionalities, you
 should take a look on the documents present in the doc directory.
 
-NeL is currently developped and tested under GNU/Linux and Windows
+Ryzom Core is currently developped and tested under GNU/Linux and Windows
 environments. 
 
 
 License
 -------
 
-NeL is a Free Software project under the GNU Affero General Public License,
+Ryzom Core is a Free Software project under the GNU Affero General Public License,
 which means all its code is available for everyone to download, examine,
 use, modify, and distribute, subject to the usual restrictions attached
 to any GPL software. If you are not familiar with the AGPL, see the COPYING

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

@@ -20,6 +20,10 @@ SET(OBJECT_VIEWER_TS    translations/object_viewer_qt_en.ts
 SET(QT_USE_QTGUI TRUE)
 SET(QT_USE_QTOPENGL TRUE)
 
+IF(WIN32)
+  SET(OBJECT_VIEWER_RC object_viewer_qt.rc)
+ENDIF(WIN32)
+
 QT4_ADD_TRANSLATION(OBJECT_VIEWER_QM ${OBJECT_VIEWER_TS})
 QT4_ADD_RESOURCES( OBJECT_VIEWER_RC_SRCS ${OBJECT_VIEWER_RCS})
 QT4_WRAP_CPP( OBJECT_VIEWER_MOC_SRCS ${OBJECT_VIEWER_HDR} )
@@ -30,7 +34,8 @@ SOURCE_GROUP(QtGeneratedMocQrcSrc FILES ${OBJECT_VIEWER_MOC_SRCS} ${OBJECT_VIEWE
 ADD_EXECUTABLE(object_viewer_qt WIN32 MACOSX_BUNDLE
                ${OBJECT_VIEWER_SRC}
                ${OBJECT_VIEWER_MOC_SRCS}
-               ${OBJECT_VIEWER_RC_SRCS})
+               ${OBJECT_VIEWER_RC_SRCS}
+	       ${OBJECT_VIEWER_RC})
 
 TARGET_LINK_LIBRARIES(object_viewer_qt
 		nelmisc 

code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc

@@ -0,0 +1,54 @@
+#include <windows.h>
+
+#define IDR_MAINFRAME                   128
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Ryzom Core\0"
+            VALUE "FileDescription", "\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "Object_Viewer_Qt\0"
+            VALUE "LegalCopyright", "Copyright (C) 2011\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "Object Viewer Qt\0"
+            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME           ICON    DISCARDABLE     "ic_nel_pill.ico"

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

@@ -1,9 +1,15 @@
 <RCC>
   <qresource prefix="/core">
-    <file>images/list-add.png</file>
+    <file>icons/ic_nel_add_item.png</file>
-    <file>images/list-remove.png</file>
+    <file>icons/ic_nel_crash.png</file>
-    <file>images/go-up.png</file>
+    <file>icons/ic_nel_delete_item.png</file>
-    <file>images/go-down.png</file>
+    <file>icons/ic_nel_down_item.png</file>
+    <file>icons/ic_nel_generic_settings.png</file>
+    <file>icons/ic_nel_open.png</file>
+    <file>icons/ic_nel_path_settings.png</file>
+    <file>icons/ic_nel_pill.png</file>
+    <file>icons/ic_nel_reset_all.png</file>
+    <file>icons/ic_nel_up_item.png</file>
     <file>images/nel.png</file>
     <file>images/preferences.png</file>
   </qresource>

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

@@ -23,53 +23,57 @@ namespace Core
 namespace Constants
 {
 
-const char * const OVQT_VERSION_LONG	= "0.0.1";
+const char * const OVQT_VERSION_LONG = "0.0.1";
-const char * const OVQT_VENDOR		= "Dzmitry Kamiahin";
+const char * const OVQT_VENDOR = "Dzmitry Kamiahin";
-const char * const OVQT_YEAR		= "2010, 2011";
+const char * const OVQT_YEAR = "2010, 2011";
 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_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 EXIT			= "ObjectViewerQt.Exit";
+const char * const EXIT	= "ObjectViewerQt.Exit";
 
-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 DATA_PATH_SECTION = "DataPath";
 const char * const SEARCH_PATHS = "SearchPaths";
 const char * const RECURSIVE_SEARCH_PATHS = "RecursiveSearchPathes";
 const char * const LEVELDESIGN_PATH = "LevelDesignPath";
-const char * const ASSETS_PATH  = "LevelDesignPath";
+const char * const ASSETS_PATH = "LevelDesignPath";
 
 //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_OPEN = ":/core/icons/ic_nel_open.png";
+const char * const ICON_CRASH = ":/core/icons/ic_nel_crash.png";
+
 } // namespace Constants
 } // namespace Core
 

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

@@ -47,7 +47,7 @@ MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *
 	QCoreApplication::setOrganizationName(QLatin1String("RyzomCore"));
 
 	setObjectName(Constants::MAIN_WINDOW);
-	setWindowIcon(QIcon(Constants::ICON_NEL));
+	setWindowIcon(QIcon(Constants::ICON_PILL));
 	setWindowTitle(tr("Object Viewer Qt"));
 
 	m_pluginManager = pluginManager;
@@ -173,7 +173,7 @@ void MainWindow::addContextObject(IContext *context)
 void MainWindow::createActions()
 {
 	m_openAction = new QAction(tr("&Open..."), this);
-	m_openAction->setIcon(QIcon(":/images/open-file.png"));
+	m_openAction->setIcon(QIcon(Constants::ICON_OPEN));
 	m_openAction->setShortcut(QKeySequence::Open);
 	m_openAction->setStatusTip(tr("Open an existing file"));
 	menuManager()->registerAction(m_openAction, Constants::OPEN);

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

@@ -74,6 +74,7 @@ QWidget *CSearchPathsSettingsPage::createPage(QWidget *parent)
 	connect(m_ui.removeToolButton, SIGNAL(clicked()), this, SLOT(delPath()));
 	connect(m_ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath()));
 	connect(m_ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath()));
+	connect(m_ui.resetToolButton, SIGNAL(clicked()), m_ui.pathsListWidget, SLOT(clear()));
 	return m_page;
 }
 

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

@@ -53,12 +53,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Add</string>
+       </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset resource="core.qrc">
-         <normaloff>:/core/images/list-add.png</normaloff>:/core/images/list-add.png</iconset>
+         <normaloff>:/core/icons/ic_nel_add_item.png</normaloff>:/core/icons/ic_nel_add_item.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -79,12 +82,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Delete</string>
+       </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset resource="core.qrc">
-         <normaloff>:/core/images/list-remove.png</normaloff>:/core/images/list-remove.png</iconset>
+         <normaloff>:/core/icons/ic_nel_delete_item.png</normaloff>:/core/icons/ic_nel_delete_item.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -105,12 +111,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Up</string>
+       </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset resource="core.qrc">
-         <normaloff>:/core/images/go-up.png</normaloff>:/core/images/go-up.png</iconset>
+         <normaloff>:/core/icons/ic_nel_up_item.png</normaloff>:/core/icons/ic_nel_up_item.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -131,12 +140,38 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Down</string>
+       </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset resource="core.qrc">
-         <normaloff>:/core/images/go-down.png</normaloff>:/core/images/go-down.png</iconset>
+         <normaloff>:/core/icons/ic_nel_down_item.png</normaloff>:/core/icons/ic_nel_down_item.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="resetToolButton">
+       <property name="toolTip">
+        <string>Reset</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="core.qrc">
+         <normaloff>:/core/icons/ic_nel_reset_all.png</normaloff>:/core/icons/ic_nel_reset_all.png</iconset>
        </property>
        <property name="iconSize">
         <size>

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

@@ -62,7 +62,11 @@ class CExampleContext: public Core::IContext
 {
 	Q_OBJECT
 public:
-	CExampleContext(QObject *parent = 0): IContext(parent) {}
+	CExampleContext(QObject *parent = 0): IContext(parent)
+	{
+		m_simpleViewer = new CSimpleViewer();
+	}
+
 	virtual ~CExampleContext() {}
 
 	virtual QString id() const
@@ -79,8 +83,10 @@ public:
 	}
 	virtual QWidget *widget()
 	{
-		return new CSimpleViewer();
+		return m_simpleViewer;
 	}
+
+	CSimpleViewer *m_simpleViewer;
 };
 
 } // namespace Plugin

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

@@ -70,7 +70,8 @@ SET(OBJECT_VIEWER_PLUGIN_HDR 	object_viewer_plugin.h
 				camera_control.h
 				graphics_settings_page.h
 				sound_settings_page.h
-				vegetable_settings_page.h)
+				vegetable_settings_page.h
+				scheme_bank_dialog.h)
 
 SET(OBJECT_VIEWER_PLUGIN_UIS    animation_form.ui
 				animation_set_form.ui
@@ -120,7 +121,9 @@ SET(OBJECT_VIEWER_PLUGIN_UIS    animation_form.ui
 				tune_timer_form.ui
 				graphics_settings_page.ui
 				sound_settings_page.ui
-				vegetable_settings_page.ui)
+				vegetable_settings_page.ui
+				scheme_bank_form.ui
+				value_gradient_form.ui)
 
 SET(OBJECT_VIEWER_PLUGIN_RCS object_viewer.qrc)
 

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

@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="object_viewer.qrc">
-    <normaloff>:/images/animset.png</normaloff>:/images/animset.png</iconset>
+    <normaloff>:/icons/ic_nel_animset.png</normaloff>:/icons/ic_nel_animset.png</iconset>
   </property>
   <property name="windowTitle">
    <string>Animation set manager</string>
@@ -309,7 +309,7 @@
         </property>
         <property name="icon">
          <iconset resource="object_viewer.qrc">
-          <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
+          <normaloff>:/icons/ic_nel_reset_all.png</normaloff>:/icons/ic_nel_reset_all.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -355,7 +355,7 @@
         </property>
         <property name="icon">
          <iconset resource="object_viewer.qrc">
-          <normaloff>:/images/list-add.png</normaloff>:/images/list-add.png</iconset>
+          <normaloff>:/icons/ic_nel_add_item.png</normaloff>:/icons/ic_nel_add_item.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -381,7 +381,7 @@
         </property>
         <property name="icon">
          <iconset resource="object_viewer.qrc">
-          <normaloff>:/images/list-remove.png</normaloff>:/images/list-remove.png</iconset>
+          <normaloff>:/icons/ic_nel_delete_item.png</normaloff>:/icons/ic_nel_delete_item.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -404,7 +404,7 @@
         </property>
         <property name="icon">
          <iconset resource="object_viewer.qrc">
-          <normaloff>:/images/go-up.png</normaloff>:/images/go-up.png</iconset>
+          <normaloff>:/icons/ic_nel_up_item.png</normaloff>:/icons/ic_nel_up_item.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -427,7 +427,7 @@
         </property>
         <property name="icon">
          <iconset resource="object_viewer.qrc">
-          <normaloff>:/images/go-down.png</normaloff>:/images/go-down.png</iconset>
+          <normaloff>:/icons/ic_nel_down_item.png</normaloff>:/icons/ic_nel_down_item.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -471,7 +471,7 @@
         </property>
         <property name="icon">
          <iconset resource="object_viewer.qrc">
-          <normaloff>:/images/time.png</normaloff>:/images/time.png</iconset>
+          <normaloff>:/icons/ic_nel_framedelay.png</normaloff>:/icons/ic_nel_framedelay.png</iconset>
         </property>
         <property name="iconSize">
          <size>

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

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>231</width>
+    <width>208</width>
-    <height>213</height>
+    <height>217</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -37,82 +37,83 @@
      </item>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3">
+   <item row="0" column="1" colspan="3">
-    <widget class="NLQT::CBasicEditWidget" name="constAttribPlaneWidget" native="true"/>
+    <widget class="QWidget" name="schemeEditWidget" native="true">
-   </item>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
-   <item row="3" column="0" colspan="3">
+      <property name="spacing">
-    <widget class="NLQT::CColorEditWidget" name="constRGBAWidget" native="true"/>
+       <number>1</number>
-   </item>
+      </property>
-   <item row="4" column="0" colspan="3">
+      <property name="margin">
-    <widget class="NLQT::CEditRangeIntWidget" name="constRangeIntWidget" native="true"/>
+       <number>0</number>
-   </item>
+      </property>
-   <item row="5" column="0" colspan="3">
+      <item>
-    <widget class="NLQT::CEditRangeFloatWidget" name="constRangeFloatWidget" native="true"/>
+       <spacer name="horizontalSpacer">
-   </item>
+        <property name="orientation">
-   <item row="6" column="0" colspan="3">
+         <enum>Qt::Horizontal</enum>
-    <widget class="NLQT::CEditRangeUIntWidget" name="constRangeUIntWidget" native="true"/>
+        </property>
-   </item>
+        <property name="sizeHint" stdset="0">
-   <item row="7" column="0" rowspan="2" colspan="3">
+         <size>
-    <widget class="Line" name="line">
+          <width>5</width>
-     <property name="orientation">
+          <height>5</height>
-      <enum>Qt::Horizontal</enum>
+         </size>
-     </property>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="editPushButton">
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>E</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="userParamPushButton">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>U</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="bankButton">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>B</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="9" column="0">
+   <item row="1" column="0" colspan="4">
-    <widget class="QLabel" name="inputLabel">
-     <property name="text">
-      <string>Input mutliplier:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1" rowspan="2">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>108</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="8" column="2" rowspan="2">
-    <widget class="QCheckBox" name="clampCheckBox">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Clamp</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="0" colspan="3">
-    <widget class="NLQT::CEditRangeFloatWidget" name="inMultiplierWidget" native="true">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Preferred</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>1</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="3">
     <widget class="QWidget" name="schemeWidget" native="true">
      <property name="enabled">
       <bool>true</bool>
@@ -127,19 +128,6 @@
       <item row="0" column="0">
        <widget class="QComboBox" name="schemeComboBox"/>
       </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="editPushButton">
-        <property name="maximumSize">
-         <size>
-          <width>30</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>E</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
@@ -211,57 +199,84 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="userParamPushButton">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>30</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>U</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="putPushButton">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>30</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>P</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <widget class="QPushButton" name="getPushButton">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>30</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>G</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
+   <item row="2" column="0" colspan="4">
+    <widget class="NLQT::CBasicEditWidget" name="constAttribPlaneWidget" native="true"/>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="NLQT::CColorEditWidget" name="constRGBAWidget" native="true"/>
+   </item>
+   <item row="4" column="0" colspan="4">
+    <widget class="NLQT::CEditRangeIntWidget" name="constRangeIntWidget" native="true"/>
+   </item>
+   <item row="5" column="0" colspan="4">
+    <widget class="NLQT::CEditRangeFloatWidget" name="constRangeFloatWidget" native="true"/>
+   </item>
+   <item row="6" column="0" colspan="4">
+    <widget class="NLQT::CEditRangeUIntWidget" name="constRangeUIntWidget" native="true"/>
+   </item>
+   <item row="7" column="0" colspan="4">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QLabel" name="inputLabel">
+     <property name="text">
+      <string>Input mutliplier:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>108</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="8" column="3">
+    <widget class="QCheckBox" name="clampCheckBox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Clamp</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="4">
+    <widget class="NLQT::CEditRangeFloatWidget" name="inMultiplierWidget" native="true">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Preferred</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>1</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>

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

@@ -39,6 +39,7 @@
 #include "value_from_emitter_dialog.h"
 #include "spinner_dialog.h"
 #include "follow_path_dialog.h"
+#include "scheme_bank_dialog.h"
 
 namespace NLQT
 {
@@ -59,6 +60,7 @@ CAttribWidget::CAttribWidget(QWidget *parent)
 	_ui.constRangeIntWidget->hide();
 	_ui.constRGBAWidget->hide();
 	_ui.schemeWidget->hide();
+	_ui.schemeEditWidget->hide();
 
 	_ui.inMultiplierWidget->setRange(0.1f, 10.1f);
 	_ui.inMultiplierWidget->enableLowerBound(0, true);;
@@ -82,6 +84,7 @@ void CAttribWidget::init()
 	connect(_ui.schemeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCurrentScheme(int)));
 	connect(_ui.srcComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentSrc(int)));
 	connect(_ui.userParamPushButton, SIGNAL(clicked()), this, SLOT(setUserIndex()));
+	connect(_ui.bankButton, SIGNAL(clicked()), this, SLOT(openSchemeBankDialog()));
 	connect(_ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeUseScheme(int)));
 }
 
@@ -181,6 +184,16 @@ void CAttribWidget::changeUseScheme(int index)
 	}
 }
 
+void CAttribWidget::openSchemeBankDialog()
+{
+	CSchemeBankDialog *dialog = new CSchemeBankDialog(this);
+	dialog->setModal(true);
+	dialog->show();
+	dialog->exec();
+	delete dialog;
+	//updateUi();
+}
+
 void CAttribWidget::inputValueUpdate(void)
 {
 	if (useScheme() && getSchemeInput().InputType == NL3D::CPSInputType::attrUserParam)
@@ -206,7 +219,7 @@ void CAttribWidget::schemeValueUpdate()
 	_ui.constRGBAWidget->hide();
 
 	_ui.schemeWidget->show();
-
+	_ui.schemeEditWidget->show();
 	sint k = getCurrentScheme();
 
 	if (k == -1) // unknow scheme ...
@@ -312,11 +325,11 @@ QDialog *CAttribFloatWidget::editScheme(void)
 	if (dynamic_cast<NL3D::CPSFloatGradient *>(scheme))
 	{
 		CFloatGradientWrapper *wrapper = new CFloatGradientWrapper;
-		wrapper->MinRange = _MinRange;
+		wrapper->m_minRange = _MinRange;
-		wrapper->MaxRange = _MaxRange;
+		wrapper->m_maxRange = _MaxRange;
-		wrapper->Scheme = &(((NL3D::CPSFloatGradient *) (_SchemeWrapper->getScheme()) )->_F);
+		wrapper->m_scheme = &(((NL3D::CPSFloatGradient *) (_SchemeWrapper->getScheme()) )->_F);
 		CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
-		wrapper->DefaultValue = 0.f;
+		wrapper->m_defaultValue = 0.f;
 		return gd;
 	}
 	if (dynamic_cast<NL3D::CPSFloatMemory *>(scheme))
@@ -423,6 +436,7 @@ sint CAttribFloatWidget::getCurrentScheme(void) const
 void CAttribFloatWidget::cstValueUpdate()
 {
 	_ui.schemeWidget->hide();
+	_ui.schemeEditWidget->hide();
 	_ui.inMultiplierWidget->setEnabled(false);
 	_ui.clampCheckBox->setEnabled(false);
 	_ui.inputLabel->setEnabled(false);
@@ -473,11 +487,11 @@ QDialog *CAttribUIntWidget::editScheme(void)
 	if (dynamic_cast<const NL3D::CPSUIntGradient *>(scheme))
 	{
 		CUIntGradientWrapper *wrapper = new CUIntGradientWrapper;
-		wrapper->MinRange = _MinRange;
+		wrapper->m_minRange = _MinRange;
-		wrapper->MaxRange = _MaxRange;
+		wrapper->m_maxRange = _MaxRange;
-		wrapper->Scheme = &(((NL3D::CPSUIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
+		wrapper->m_scheme = &(((NL3D::CPSUIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
 		CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
-		wrapper->DefaultValue = 0;
+		wrapper->m_defaultValue = 0;
 		return gd;
 
 	}
@@ -560,6 +574,7 @@ sint CAttribUIntWidget::getCurrentScheme(void) const
 void CAttribUIntWidget::cstValueUpdate()
 {
 	_ui.schemeWidget->hide();
+	_ui.schemeEditWidget->hide();
 	_ui.inMultiplierWidget->setEnabled(false);
 	_ui.clampCheckBox->setEnabled(false);
 	_ui.inputLabel->setEnabled(false);
@@ -610,11 +625,11 @@ QDialog *CAttribIntWidget::editScheme(void)
 	if (dynamic_cast<const NL3D::CPSIntGradient *>(scheme))
 	{
 		CIntGradientWrapper *wrapper = new CIntGradientWrapper;
-		wrapper->MinRange = _MinRange;
+		wrapper->m_minRange = _MinRange;
-		wrapper->MaxRange = _MaxRange;
+		wrapper->m_maxRange = _MaxRange;
-		wrapper->Scheme = &(((NL3D::CPSIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
+		wrapper->m_scheme = &(((NL3D::CPSIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
 		CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
-		wrapper->DefaultValue = 0;
+		wrapper->m_defaultValue = 0;
 		return gd;
 	}
 	if (dynamic_cast<const NL3D::CPSIntMemory *>(scheme))
@@ -695,6 +710,7 @@ sint CAttribIntWidget::getCurrentScheme(void) const
 void CAttribIntWidget::cstValueUpdate()
 {
 	_ui.schemeWidget->hide();
+	_ui.schemeEditWidget->hide();
 	_ui.inMultiplierWidget->setEnabled(false);
 	_ui.clampCheckBox->setEnabled(false);
 	_ui.inputLabel->setEnabled(false);
@@ -737,9 +753,9 @@ QDialog *CAttribRGBAWidget::editScheme(void)
 	if (dynamic_cast<const NL3D::CPSColorGradient *>(scheme))
 	{
 		CColorGradientWrapper *wrapper = new CColorGradientWrapper;
-		wrapper->Scheme = &(((NL3D::CPSColorGradient *) (_SchemeWrapper->getScheme()) )->_F);
+		wrapper->m_scheme = &(((NL3D::CPSColorGradient *) (_SchemeWrapper->getScheme()) )->_F);
 		CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
-		wrapper->DefaultValue = NLMISC::CRGBA::White;
+		wrapper->m_defaultValue = NLMISC::CRGBA::White;
 		return gd;
 	}
 	if (dynamic_cast<const NL3D::CPSColorBlenderExact *>(scheme))
@@ -827,6 +843,7 @@ sint CAttribRGBAWidget::getCurrentScheme(void) const
 void CAttribRGBAWidget::cstValueUpdate()
 {
 	_ui.schemeWidget->hide();
+	_ui.schemeEditWidget->hide();
 	_ui.inMultiplierWidget->setEnabled(false);
 	_ui.clampCheckBox->setEnabled(false);
 	_ui.inputLabel->setEnabled(false);
@@ -861,9 +878,9 @@ QDialog *CAttribPlaneBasisWidget::editScheme(void)
 	if (dynamic_cast<NL3D::CPSPlaneBasisGradient *>(scheme))
 	{
 		CPlaneBasisGradientWrapper *wrapper = new CPlaneBasisGradientWrapper;
-		wrapper->Scheme = &(((NL3D::CPSPlaneBasisGradient *) (_SchemeWrapper->getScheme()) )->_F);
+		wrapper->m_scheme = &(((NL3D::CPSPlaneBasisGradient *) (_SchemeWrapper->getScheme()) )->_F);
 		CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
-		wrapper->DefaultValue = NL3D::CPlaneBasis(NLMISC::CVector::K);
+		wrapper->m_defaultValue = NL3D::CPlaneBasis(NLMISC::CVector::K);
 		return gd;
 	}
 	if (dynamic_cast<NL3D::CPSPlaneBasisFollowSpeed *>(scheme))
@@ -964,6 +981,7 @@ sint CAttribPlaneBasisWidget::getCurrentScheme(void) const
 void CAttribPlaneBasisWidget::cstValueUpdate()
 {
 	_ui.schemeWidget->hide();
+	_ui.schemeEditWidget->hide();
 	_ui.inMultiplierWidget->setEnabled(false);
 	_ui.clampCheckBox->setEnabled(false);
 	_ui.inputLabel->setEnabled(false);

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

@@ -109,6 +109,7 @@ private Q_SLOTS:
 	virtual void setCurrentSrc(int index);
 	virtual void setUserIndex();
 	virtual void changeUseScheme(int index);
+	virtual void openSchemeBankDialog();
 
 protected:
 

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

@@ -33,6 +33,7 @@
 
 // Project includes
 #include "modules.h"
+#include "object_viewer_constants.h"
 
 static int camId = 0;
 
@@ -106,11 +107,13 @@ CCameraControl::CCameraControl(QWidget *parent)
 {
 	_camToolBar = new QToolBar(tr("CameraControl"), parent);
 
-	_fpsAction = _camToolBar->addAction(tr("Fly"));
+	_fpsAction = _camToolBar->addAction(tr("Camera frs"));
+	_fpsAction->setIcon(QIcon(Constants::ICON_CAMERA_FPS));
 	_fpsAction->setStatusTip(tr("Set firstPerson camera mode"));
 	_fpsAction->setCheckable(true);
 
-	_edit3dAction = _camToolBar->addAction(tr("Edit"));
+	_edit3dAction = _camToolBar->addAction(tr("Camera 3dEdit"));
+	_edit3dAction->setIcon(QIcon(Constants::ICON_CAMERA_3DEDIT));
 	_edit3dAction->setStatusTip(tr("Set edit3d camera mode"));
 	_edit3dAction->setCheckable(true);
 
@@ -160,12 +163,12 @@ CCameraControl::CCameraControl(QWidget *parent)
 
 	_camToolBar->addSeparator();
 	_addCamAction = _camToolBar->addAction(tr("Create camera"));
-	_addCamAction->setIcon(QIcon(":/images/cam_add.png"));
+	_addCamAction->setIcon(QIcon(Constants::ICON_CAMERA_ADD));
 	_addCamAction->setStatusTip(tr("Create new camera"));
 	connect(_addCamAction, SIGNAL(triggered()), this, SLOT(addCamera()));
 
 	_delCamAction = _camToolBar->addAction(tr("Delete camera"));
-	_delCamAction->setIcon(QIcon(":/images/cam_del.png"));
+	_delCamAction->setIcon(QIcon(Constants::ICON_CAMERA_DEL));
 	_delCamAction->setStatusTip(tr("Delete current camera"));
 	connect(_delCamAction, SIGNAL(triggered()), this, SLOT(delCamera()));
 
@@ -176,6 +179,7 @@ CCameraControl::CCameraControl(QWidget *parent)
 
 	_camToolBar->addSeparator();
 	_resetCamAction = _camToolBar->addAction(tr("Reset camera"));
+	_resetCamAction->setIcon(QIcon(Constants::ICON_RESET_CAMERA));
 	_resetCamAction->setStatusTip(tr("Reset current camera"));
 	//_resetCamAction->setShortcut(tr("Ctrl+R"));
 	connect(_resetCamAction, SIGNAL(triggered()), this, SLOT(resetCamera()));