merge default

--HG--
branch : branch-mission-compiler-qt

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

@@ -124,6 +124,7 @@ sint main(int argc, char **argv)
 
 		nlinfo("Welcome to NeL Object Viewer Qt!");
 	}
+	QApplication::setGraphicsSystem("raster");
 	QApplication app(argc, argv);
 	QSplashScreen *splash = new QSplashScreen();
 	splash->setPixmap(QPixmap(":/images/nel_ide_load.png"));

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

@@ -1,6 +1,8 @@
 <RCC>
   <qresource prefix="/core">
     <file>icons/ic_nel_add_item.png</file>
+    <file>icons/ic_nel_redo.png</file>
+    <file>icons/ic_nel_undo.png</file>
     <file>icons/ic_nel_crash.png</file>
     <file>icons/ic_nel_delete_item.png</file>
     <file>icons/ic_nel_down_item.png</file>

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

@@ -112,6 +112,8 @@ 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_AS = ":/core/icons/ic_nel_save_as.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_REDO = ":/core/icons/ic_nel_redo.png";
 
 } // namespace Constants
 } // namespace Core

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

@@ -384,8 +384,12 @@ void MainWindow::createMenus()
 
 	m_editMenu = m_menuBar->addMenu(tr("&Edit"));
 	QAction *undoAction = m_undoGroup->createUndoAction(this);
+	menuManager()->registerAction(undoAction, Constants::UNDO);
+	undoAction->setIcon(QIcon(Constants::ICON_UNDO));
 	undoAction->setShortcut(QKeySequence::Undo);
 	QAction *redoAction = m_undoGroup->createRedoAction(this);
+	menuManager()->registerAction(redoAction, Constants::REDO);
+	redoAction->setIcon(QIcon(Constants::ICON_REDO));
 	redoAction->setShortcut(QKeySequence::Redo);
 	m_editMenu->addAction(undoAction);
 	m_editMenu->addAction(redoAction);

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

@@ -68,7 +68,7 @@ namespace Plugin
 	{
 		Q_UNUSED(errorString);
 		m_plugMan = pluginManager;
-		m_logSettingsPage = new CLogSettingsPage(this);
+		m_logSettingsPage = new CLogSettingsPage(this, this);
 		addAutoReleasedObject(m_logSettingsPage);
 		return true;
 	}
@@ -139,10 +139,10 @@ namespace Plugin
 		QSettings *settings = Core::ICore::instance()->settings();
 
 		settings->beginGroup(Core::Constants::LOG_SECTION);
-		bool error = settings->value(Core::Constants::LOG_ERROR,     true).toBool();
+		bool error = settings->value(Core::Constants::LOG_ERROR,     true).toBool();
-		bool warning = settings->value(Core::Constants::LOG_WARNING, true).toBool();
+		bool warning = settings->value(Core::Constants::LOG_WARNING, true).toBool();
-		bool debug = settings->value(Core::Constants::LOG_DEBUG,     true).toBool();
+		bool debug = settings->value(Core::Constants::LOG_DEBUG,     true).toBool();
-		bool assert = settings->value(Core::Constants::LOG_ASSERT,   true).toBool();
+		bool assert = settings->value(Core::Constants::LOG_ASSERT,   true).toBool();
 		bool info = settings->value(Core::Constants::LOG_INFO,       true).toBool();
 		settings->endGroup();
 

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

@@ -28,8 +28,8 @@
 #include <QtGui/QWidget>
 #include <QtCore/QSettings>
 
-namespace ExtensionSystem
+namespace ExtensionSystem
-{
+{
 	class IPluginManager;
 }
 
@@ -38,13 +38,14 @@ namespace Plugin
 
 	class CLogPlugin;
 
-	CLogSettingsPage::CLogSettingsPage(QObject *parent)
+	CLogSettingsPage::CLogSettingsPage(CLogPlugin *logPlugin, QObject *parent)
 		: IOptionsPage(parent),
+		m_logPlugin(logPlugin),
 		m_currentPage(NULL),
-		m_error(true),
+		m_error(true),
-		m_warning(true),
+		m_warning(true),
-		m_debug(true),
+		m_debug(true),
-		m_assert(true),
+		m_assert(true),
 		m_info(true)
 	{
 	}
@@ -115,10 +116,10 @@ namespace Plugin
 		QSettings *settings = Core::ICore::instance()->settings();
 
 		settings->beginGroup(Core::Constants::LOG_SECTION);
-		m_error = settings->value(Core::Constants::LOG_ERROR,     true).toBool();
+		m_error = settings->value(Core::Constants::LOG_ERROR,     true).toBool();
-		m_warning = settings->value(Core::Constants::LOG_WARNING, true).toBool();
+		m_warning = settings->value(Core::Constants::LOG_WARNING, true).toBool();
-		m_debug = settings->value(Core::Constants::LOG_DEBUG,     true).toBool();
+		m_debug = settings->value(Core::Constants::LOG_DEBUG,     true).toBool();
-		m_assert = settings->value(Core::Constants::LOG_ASSERT,   true).toBool();
+		m_assert = settings->value(Core::Constants::LOG_ASSERT,   true).toBool();
 		m_info = settings->value(Core::Constants::LOG_INFO,       true).toBool();
 		settings->endGroup();
 	}

code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.h

@@ -29,6 +29,8 @@ class QWidget;
 
 namespace Plugin
 {
+	class CLogPlugin;
+
 	/**
 	@class CLogSettingsPage
 	*/
@@ -36,7 +38,7 @@ namespace Plugin
 	{
 		Q_OBJECT
 	public:
-		CLogSettingsPage(QObject *parent = 0);
+		CLogSettingsPage(CLogPlugin *logPlugin, QObject *parent = 0);
 		virtual ~CLogSettingsPage() {}
 
 		virtual QString id() const;
@@ -53,6 +55,7 @@ namespace Plugin
 		void readSettings();
 		void writeSettings();
 
+		CLogPlugin *m_logPlugin;
 		QWidget             *m_currentPage;
 		Ui::CLogSettingsPage m_ui;