From 4a01dab0064ad49a6434b3804e033b55270a86f0 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 25 Dec 2018 23:04:32 -0500 Subject: [PATCH] Rename inspector --- tools/leveleditor/CMakeLists.txt | 4 +-- tools/leveleditor/include/mainwindow.h | 2 +- .../include/{inspector.h => properties.h} | 12 ++++---- tools/leveleditor/src/mainwindow.cpp | 18 ++++++------ .../src/{inspector.cpp => properties.cpp} | 28 +++++++++---------- 5 files changed, 32 insertions(+), 32 deletions(-) rename tools/leveleditor/include/{inspector.h => properties.h} (50%) rename tools/leveleditor/src/{inspector.cpp => properties.cpp} (81%) diff --git a/tools/leveleditor/CMakeLists.txt b/tools/leveleditor/CMakeLists.txt index 7e34a06..379320b 100644 --- a/tools/leveleditor/CMakeLists.txt +++ b/tools/leveleditor/CMakeLists.txt @@ -1,7 +1,7 @@ set(INCLUDE_FILES include/mainwindow.h include/hierarchy.h - include/inspector.h) + include/properties.h) qt5_wrap_cpp(EDITOR_SRC ${INCLUDE_FILES}) @@ -9,7 +9,7 @@ add_executable(LevelEditor src/main.cpp src/mainwindow.cpp src/hierarchy.cpp - src/inspector.cpp + src/properties.cpp ${EDITOR_SRC}) target_include_directories(LevelEditor PRIVATE include) target_link_libraries(LevelEditor Qt5::Widgets Engine ToolWindowManager EditorCommon) diff --git a/tools/leveleditor/include/mainwindow.h b/tools/leveleditor/include/mainwindow.h index 6bc0a09..cffc16f 100644 --- a/tools/leveleditor/include/mainwindow.h +++ b/tools/leveleditor/include/mainwindow.h @@ -13,7 +13,7 @@ public: private: void addSceneView(); void addHierarchy(); - void addInspector(); + void addProperties(); Context& context; ToolWindowManager* manager = nullptr; diff --git a/tools/leveleditor/include/inspector.h b/tools/leveleditor/include/properties.h similarity index 50% rename from tools/leveleditor/include/inspector.h rename to tools/leveleditor/include/properties.h index 5a5d3f5..2ad87b7 100644 --- a/tools/leveleditor/include/inspector.h +++ b/tools/leveleditor/include/properties.h @@ -9,18 +9,18 @@ struct TransformComponent; struct MeshComponent; struct LightComponent; -class Inspector : public QWidget { +class Properties : public QWidget { Q_OBJECT public: - Inspector(Context& context, QWidget* parent = nullptr); + Properties(Context& context, QWidget* parent = nullptr); private: void rebuild(); - void addInfoInspector(InfoComponent* info); - void addTransformInspector(TransformComponent* transform); - void addMeshInspector(MeshComponent* mesh); - void addLightInspector(LightComponent* light); + void addInfoSection(InfoComponent* info); + void addTransformSection(TransformComponent* transform); + void addMeshSection(MeshComponent* mesh); + void addLightSection(LightComponent* light); QVBoxLayout* layout = nullptr; diff --git a/tools/leveleditor/src/mainwindow.cpp b/tools/leveleditor/src/mainwindow.cpp index b538f22..9b88841 100644 --- a/tools/leveleditor/src/mainwindow.cpp +++ b/tools/leveleditor/src/mainwindow.cpp @@ -11,7 +11,7 @@ #include "renderwindow.h" #include "renderer.h" #include "hierarchy.h" -#include "inspector.h" +#include "properties.h" MainWindow::MainWindow(Context& context) : context(context) { setWindowTitle("Level Editor"); @@ -124,10 +124,10 @@ MainWindow::MainWindow(Context& context) : context(context) { addHierarchy->setIcon(QIcon::fromTheme("view-sort-ascending")); newViewMenu->addAction(addHierarchy); - QAction* addInspector = new QAction("Inspector"); - connect(addInspector, &QAction::triggered, this, &MainWindow::addInspector); - addInspector->setIcon(QIcon::fromTheme("edit-cut")); - newViewMenu->addAction(addInspector); + QAction* addProperties = new QAction("Properties"); + connect(addProperties, &QAction::triggered, this, &MainWindow::addProperties); + addProperties->setIcon(QIcon::fromTheme("document-properties")); + newViewMenu->addAction(addProperties); } mainMenuBar->addSeparator(); @@ -144,7 +144,7 @@ MainWindow::MainWindow(Context& context) : context(context) { addSceneView(); addHierarchy(); - addInspector(); + addProperties(); } void MainWindow::addSceneView() { @@ -164,9 +164,9 @@ void MainWindow::addHierarchy() { manager->addToolWindow(hierarchy, ToolWindowManager::AreaReference(ToolWindowManager::EmptySpace)); } -void MainWindow::addInspector() { - Inspector* inspector = new Inspector(context); +void MainWindow::addProperties() { + Properties* properties = new Properties(context); - manager->addToolWindow(inspector, ToolWindowManager::AreaReference(ToolWindowManager::EmptySpace)); + manager->addToolWindow(properties, ToolWindowManager::AreaReference(ToolWindowManager::EmptySpace)); } diff --git a/tools/leveleditor/src/inspector.cpp b/tools/leveleditor/src/properties.cpp similarity index 81% rename from tools/leveleditor/src/inspector.cpp rename to tools/leveleditor/src/properties.cpp index 1089835..e180637 100644 --- a/tools/leveleditor/src/inspector.cpp +++ b/tools/leveleditor/src/properties.cpp @@ -1,4 +1,4 @@ -#include "inspector.h" +#include "properties.h" #include #include @@ -12,9 +12,9 @@ #include "collapsesection.h" #include "coloredit.h" -Inspector::Inspector(Context& context, QWidget* parent) : QWidget(parent), context(context) { - setWindowTitle("Inspector"); - setWindowIcon(QIcon::fromTheme("edit-cut")); +Properties::Properties(Context& context, QWidget* parent) : QWidget(parent), context(context) { + setWindowTitle("Properties"); + setWindowIcon(QIcon::fromTheme("document-properties")); layout = new QVBoxLayout(); layout->setAlignment(Qt::AlignTop); @@ -24,10 +24,10 @@ Inspector::Inspector(Context& context, QWidget* parent) : QWidget(parent), conte rebuild(); - connect(&context, &Context::selectionChanged, this, &Inspector::rebuild); + connect(&context, &Context::selectionChanged, this, &Properties::rebuild); } -void Inspector::rebuild() { +void Properties::rebuild() { for(auto section : sections) { layout->removeWidget(section); delete section; @@ -42,22 +42,22 @@ void Inspector::rebuild() { InfoComponent* info = ECS::getComponent(entity); if(info) - addInfoInspector(info); + addInfoSection(info); TransformComponent* transform = ECS::getComponent(entity); if(transform) - addTransformInspector(transform); + addTransformSection(transform); MeshComponent* mesh = ECS::getComponent(entity); if(mesh) - addMeshInspector(mesh); + addMeshSection(mesh); LightComponent* light = ECS::getComponent(entity); if(light) - addLightInspector(light); + addLightSection(light); } -void Inspector::addInfoInspector(InfoComponent* info) { +void Properties::addInfoSection(InfoComponent* info) { CollapseSection* section = new CollapseSection("Info"); layout->addWidget(section); sections.push_back(section); @@ -77,7 +77,7 @@ void Inspector::addInfoInspector(InfoComponent* info) { layout->addWidget(nameEdit, 0, 1); } -void Inspector::addTransformInspector(TransformComponent* transform) { +void Properties::addTransformSection(TransformComponent* transform) { CollapseSection* section = new CollapseSection("Transform"); layout->addWidget(section); sections.push_back(section); @@ -92,7 +92,7 @@ void Inspector::addTransformInspector(TransformComponent* transform) { layout->addWidget(positionEdit, 0, 1); } -void Inspector::addMeshInspector(MeshComponent* mesh) { +void Properties::addMeshSection(MeshComponent* mesh) { CollapseSection* section = new CollapseSection("Mesh", true); layout->addWidget(section); sections.push_back(section); @@ -101,7 +101,7 @@ void Inspector::addMeshInspector(MeshComponent* mesh) { section->setLayout(layout); } -void Inspector::addLightInspector(LightComponent* light) { +void Properties::addLightSection(LightComponent* light) { CollapseSection* section = new CollapseSection("Light", true); layout->addWidget(section); sections.push_back(section);