From a02ddb236989cc80a8207e94af74dff4ebae21aa Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Sat, 30 Jul 2011 21:58:48 +0300 Subject: [PATCH] Changed: #1302 Added world edit mode toolbar. --- .../world_editor/icons/ic_nel_move.png | Bin 0 -> 3170 bytes .../world_editor/icons/ic_nel_rotate.png | Bin 0 -> 4089 bytes .../world_editor/icons/ic_nel_scale.png | Bin 0 -> 4299 bytes .../world_editor/icons/ic_nel_select.png | Bin 0 -> 3182 bytes .../world_editor/icons/ic_nel_turn.png | Bin 0 -> 2747 bytes .../src/plugins/world_editor/world_editor.qrc | 5 + .../world_editor/world_editor_window.cpp | 28 +++ .../world_editor/world_editor_window.h | 2 + .../world_editor/world_editor_window.ui | 187 +++++++++++++++++- 9 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_move.png create mode 100644 code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_rotate.png create mode 100644 code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_scale.png create mode 100644 code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_select.png create mode 100644 code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_turn.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_move.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_move.png new file mode 100644 index 0000000000000000000000000000000000000000..7039bd070067c121c446c52b291dd1b0a30901e4 GIT binary patch literal 3170 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 IM6N<$f`VA}i2wiq literal 0 HcmV?d00001 diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_rotate.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_rotate.png new file mode 100644 index 0000000000000000000000000000000000000000..73a0be2fe53e26e96b41a42c442c5462de39bd95 GIT binary patch literal 4089 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 literal 0 HcmV?d00001 diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_scale.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_scale.png new file mode 100644 index 0000000000000000000000000000000000000000..e76150ab4b4e0043d081774fd2f4e9d25fab1233 GIT binary patch literal 4299 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 literal 0 HcmV?d00001 diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_select.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_select.png new file mode 100644 index 0000000000000000000000000000000000000000..9a677b8a668b175260825db8a6614c1d456c17f2 GIT binary patch literal 3182 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 literal 0 HcmV?d00001 diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_turn.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_turn.png new file mode 100644 index 0000000000000000000000000000000000000000..b03cb0fd0631c078f9e308f9fd9c7b67dceea168 GIT binary patch literal 2747 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 BBOd?& literal 0 HcmV?d00001 diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor.qrc b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor.qrc index f7c54fd5f..02ffcbe00 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor.qrc +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor.qrc @@ -1,5 +1,10 @@ + icons/ic_nel_select.png + icons/ic_nel_scale.png + icons/ic_nel_rotate.png + icons/ic_nel_move.png + icons/ic_nel_turn.png icons/ic_nel_world_editor.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp index fc1f0e248..7ddb5484c 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp @@ -40,6 +40,7 @@ // Qt includes #include +#include #include namespace WorldEditor @@ -54,12 +55,28 @@ WorldEditorWindow::WorldEditorWindow(QWidget *parent) m_ui.setupUi(this); m_undoStack = new QUndoStack(this); + QActionGroup *sceneModeGroup = new QActionGroup(this); + sceneModeGroup->addAction(m_ui.selectAction); + sceneModeGroup->addAction(m_ui.moveAction); + sceneModeGroup->addAction(m_ui.rotateAction); + sceneModeGroup->addAction(m_ui.scaleAction); + sceneModeGroup->addAction(m_ui.turnAction); + sceneModeGroup->addAction(m_ui.radiusAction); + m_ui.selectAction->setChecked(true); + + m_ui.newWorldEditAction->setIcon(QIcon(Core::Constants::ICON_NEW)); + m_ui.saveWorldEditAction->setIcon(QIcon(Core::Constants::ICON_SAVE)); + m_primitivesModel = new PrimitivesTreeModel(); m_ui.treePrimitivesView->setModel(m_primitivesModel); createMenus(); createToolBars(); readSettings(); + + connect(m_ui.newWorldEditAction, SIGNAL(triggered()), this, SLOT(newWorldEditFile())); + connect(m_ui.saveWorldEditAction, SIGNAL(triggered()), this, SLOT(saveAllWorldEditFiles())); + } WorldEditorWindow::~WorldEditorWindow() @@ -96,6 +113,14 @@ void WorldEditorWindow::loadPrimitive(const QString &fileName) m_primitivesModel->loadPrimitive(fileName); } +void WorldEditorWindow::newWorldEditFile() +{ +} + +void WorldEditorWindow::saveAllWorldEditFiles() +{ +} + void WorldEditorWindow::openProjectSettings() { /* @@ -119,8 +144,11 @@ void WorldEditorWindow::createToolBars() Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager(); //QAction *action = menuManager->action(Core::Constants::NEW); //m_ui.fileToolBar->addAction(action); + + m_ui.fileToolBar->addAction(m_ui.newWorldEditAction); QAction *action = menuManager->action(Core::Constants::OPEN); m_ui.fileToolBar->addAction(action); + m_ui.fileToolBar->addAction(m_ui.saveWorldEditAction); m_ui.fileToolBar->addSeparator(); action = menuManager->action(Core::Constants::UNDO); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.h index 39e741716..1b2937dad 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.h @@ -43,6 +43,8 @@ public Q_SLOTS: void open(); private Q_SLOTS: + void newWorldEditFile(); + void saveAllWorldEditFiles(); void openProjectSettings(); private: diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.ui index 179a78830..331dc34ff 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.ui @@ -45,10 +45,19 @@ false - - + + + + + + + + + + Primitives + 2 @@ -82,6 +91,23 @@ + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + loadPrimitive @@ -92,6 +118,162 @@ newPrimitive + + + + :/icons/ic_nel_zonel.png:/icons/ic_nel_zonel.png + + + loadLand + + + + + + :/icons/ic_nel_landscape_settings.png:/icons/ic_nel_landscape_settings.png + + + LandSettings + + + + + true + + + S/H Land + + + + + true + + + S/H Primitives + + + + + true + + + S/H Layers + + + + + true + + + S/H Details + + + + + true + + + + :/icons/ic_grid.png:/icons/ic_grid.png + + + S/H Grid + + + + + true + + + S/H Grid points + + + + + New World Edit file + + + + + Save World Edit file + + + + + true + + + + :/icons/ic_nel_select.png:/icons/ic_nel_select.png + + + Select + + + + + true + + + + :/icons/ic_nel_move.png:/icons/ic_nel_move.png + + + Move + + + + + true + + + + :/icons/ic_nel_rotate.png:/icons/ic_nel_rotate.png + + + Rotate + + + + + true + + + + :/icons/ic_nel_scale.png:/icons/ic_nel_scale.png + + + Scale + + + + + true + + + + :/icons/ic_nel_turn.png:/icons/ic_nel_turn.png + + + Turn + + + + + true + + + Radius + + + + + true + + + Edit points + + @@ -107,6 +289,7 @@ +