From 92b696d7d8f014cf4c2d280e382522061bacfdff Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 00:45:53 +0100
Subject: [PATCH] no more files in GUI/View toplevel
---
GUI/CMakeLists.txt | 18 +++++++++---------
GUI/Views/FitWidgets/FitParameterWidget.cpp | 2 +-
GUI/Views/PropertyEditor/ComponentTreeView.cpp | 2 +-
.../PropertyEditor/PropertyWidgetItem.cpp | 2 +-
.../SessionModelDelegate.cpp | 4 ++--
.../SessionModelDelegate.h | 8 ++++----
GUI/Views/PropertyEditor/TestComponentView.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBar.cpp | 2 +-
GUI/Views/{ => Toplevel}/ImportDataView.cpp | 4 ++--
GUI/Views/{ => Toplevel}/ImportDataView.h | 8 ++++----
.../{ => Toplevel}/ProjectSettingsView.cpp | 4 ++--
GUI/Views/{ => Toplevel}/ProjectSettingsView.h | 8 ++++----
.../{ => Toplevel}/ProjectSettingsView.ui | 0
GUI/Views/{ => Toplevel}/SampleView.cpp | 4 ++--
GUI/Views/{ => Toplevel}/SampleView.h | 8 ++++----
GUI/Views/{ => Toplevel}/SessionModelView.cpp | 8 ++++----
GUI/Views/{ => Toplevel}/SessionModelView.h | 8 ++++----
GUI/Views/{ => Toplevel}/SimulationView.cpp | 4 ++--
GUI/Views/{ => Toplevel}/SimulationView.h | 8 ++++----
GUI/Views/{ => Toplevel}/SimulationView.ui | 0
GUI/Views/{ => Toplevel}/TestView.cpp | 4 ++--
GUI/Views/{ => Toplevel}/TestView.h | 8 ++++----
GUI/Views/{ => Toplevel}/WelcomeView.cpp | 4 ++--
GUI/Views/{ => Toplevel}/WelcomeView.h | 8 ++++----
GUI/Views/{ => Toplevel}/WelcomeView.ui | 0
GUI/mainwindow/actionmanager.cpp | 2 +-
GUI/mainwindow/mainwindow.cpp | 12 ++++++------
27 files changed, 71 insertions(+), 71 deletions(-)
rename GUI/Views/{ => PropertyEditor}/SessionModelDelegate.cpp (97%)
rename GUI/Views/{ => PropertyEditor}/SessionModelDelegate.h (87%)
rename GUI/Views/{ => Toplevel}/ImportDataView.cpp (96%)
rename GUI/Views/{ => Toplevel}/ImportDataView.h (85%)
rename GUI/Views/{ => Toplevel}/ProjectSettingsView.cpp (98%)
rename GUI/Views/{ => Toplevel}/ProjectSettingsView.h (85%)
rename GUI/Views/{ => Toplevel}/ProjectSettingsView.ui (100%)
rename GUI/Views/{ => Toplevel}/SampleView.cpp (98%)
rename GUI/Views/{ => Toplevel}/SampleView.h (86%)
rename GUI/Views/{ => Toplevel}/SessionModelView.cpp (93%)
rename GUI/Views/{ => Toplevel}/SessionModelView.h (87%)
rename GUI/Views/{ => Toplevel}/SimulationView.cpp (99%)
rename GUI/Views/{ => Toplevel}/SimulationView.h (93%)
rename GUI/Views/{ => Toplevel}/SimulationView.ui (100%)
rename GUI/Views/{ => Toplevel}/TestView.cpp (98%)
rename GUI/Views/{ => Toplevel}/TestView.h (82%)
rename GUI/Views/{ => Toplevel}/WelcomeView.cpp (96%)
rename GUI/Views/{ => Toplevel}/WelcomeView.h (80%)
rename GUI/Views/{ => Toplevel}/WelcomeView.ui (100%)
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index a1cba9eb606..f1a27acde5a 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -23,22 +23,22 @@ set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/Session
${CMAKE_CURRENT_SOURCE_DIR}/mainwindow
${CMAKE_CURRENT_SOURCE_DIR}/utils
- ${CMAKE_CURRENT_SOURCE_DIR}/Views
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/SampleDesigner
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/JobWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/FitWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/ImportDataWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/ImportDataWidgets/CsvImportAssistant
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/InstrumentWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/IntensityDataWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/JobWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/MaskWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/MaterialEditor
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/InstrumentWidgets
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/SimulationWidgets
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/FitWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/ProjectionsWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/PropertyEditor
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/MaskWidgets
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/ImportDataWidgets
- ${CMAKE_CURRENT_SOURCE_DIR}/Views/ImportDataWidgets/CsvImportAssistant
${CMAKE_CURRENT_SOURCE_DIR}/Views/RealSpaceWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/SampleDesigner
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/SimulationWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/SpecularDataWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/Tools
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/Toplevel
)
file(GLOB model_dirs ${CMAKE_CURRENT_SOURCE_DIR}/Models/*)
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 4d8fca988ed..d6637cd42ae 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -23,7 +23,7 @@
#include "GUI/Session/ParameterTreeItems.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/InfoWidgets/OverlayLabelController.h"
-#include "GUI/Views/SessionModelDelegate.h"
+#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/utils/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QAction>
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index 474646567aa..24e2c456269 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Session/SessionModel.h"
#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
-#include "GUI/Views/SessionModelDelegate.h"
+#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QBoxLayout>
#include <QStandardItemModel>
diff --git a/GUI/Views/PropertyEditor/PropertyWidgetItem.cpp b/GUI/Views/PropertyEditor/PropertyWidgetItem.cpp
index ff6f0f20e12..50141e0da91 100644
--- a/GUI/Views/PropertyEditor/PropertyWidgetItem.cpp
+++ b/GUI/Views/PropertyEditor/PropertyWidgetItem.cpp
@@ -16,7 +16,7 @@
#include "GUI/Session/SessionItemUtils.h"
#include "GUI/Session/SessionModel.h"
#include "GUI/Views/PropertyEditor/CustomEditors.h"
-#include "GUI/Views/SessionModelDelegate.h"
+#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include <QComboBox>
#include <QDataWidgetMapper>
#include <QDoubleSpinBox>
diff --git a/GUI/Views/SessionModelDelegate.cpp b/GUI/Views/PropertyEditor/SessionModelDelegate.cpp
similarity index 97%
rename from GUI/Views/SessionModelDelegate.cpp
rename to GUI/Views/PropertyEditor/SessionModelDelegate.cpp
index 33f423756a8..104c9c88987 100644
--- a/GUI/Views/SessionModelDelegate.cpp
+++ b/GUI/Views/PropertyEditor/SessionModelDelegate.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SessionModelDelegate.cpp
+//! @file GUI/Views/PropertyEditor/SessionModelDelegate.cpp
//! @brief Implements class SessionModelDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/SessionModelDelegate.h"
+#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Session/SessionItem.h"
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
diff --git a/GUI/Views/SessionModelDelegate.h b/GUI/Views/PropertyEditor/SessionModelDelegate.h
similarity index 87%
rename from GUI/Views/SessionModelDelegate.h
rename to GUI/Views/PropertyEditor/SessionModelDelegate.h
index c9d995e61c0..2b3fc2820ee 100644
--- a/GUI/Views/SessionModelDelegate.h
+++ b/GUI/Views/PropertyEditor/SessionModelDelegate.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SessionModelDelegate.h
+//! @file GUI/Views/PropertyEditor/SessionModelDelegate.h
//! @brief Defines class SessionModelDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SESSIONMODELDELEGATE_H
-#define BORNAGAIN_GUI_VIEWS_SESSIONMODELDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
+#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
#include <QStyledItemDelegate>
@@ -52,4 +52,4 @@ private:
const QModelIndex& index, const QString& text) const;
};
-#endif // BORNAGAIN_GUI_VIEWS_SESSIONMODELDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index 6232354d906..5eab58a288a 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -23,7 +23,7 @@
#include "GUI/Session/VectorItem.h"
#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
-#include "GUI/Views/SessionModelDelegate.h"
+#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/ExemplarySamples.h"
#include <QBoxLayout>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.cpp b/GUI/Views/SampleDesigner/SampleToolBar.cpp
index 52a18cb4a1e..fdc54d9c0c0 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBar.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/SampleToolBar.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
-#include "GUI/Views/SampleView.h"
+#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/Project/projectmanager.h"
#include <QAction>
#include <QButtonGroup>
diff --git a/GUI/Views/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
similarity index 96%
rename from GUI/Views/ImportDataView.cpp
rename to GUI/Views/Toplevel/ImportDataView.cpp
index e2d67d2fa3b..583979c1a12 100644
--- a/GUI/Views/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/ImportDataView.cpp
+//! @file GUI/Views/Toplevel/ImportDataView.cpp
//! @brief Implements class ImportDataView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/ImportDataView.h"
+#include "GUI/Views/Toplevel/ImportDataView.h"
#include "GUI/Session/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
diff --git a/GUI/Views/ImportDataView.h b/GUI/Views/Toplevel/ImportDataView.h
similarity index 85%
rename from GUI/Views/ImportDataView.h
rename to GUI/Views/Toplevel/ImportDataView.h
index 9957e155fe2..c2e1013546c 100644
--- a/GUI/Views/ImportDataView.h
+++ b/GUI/Views/Toplevel/ImportDataView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/ImportDataView.h
+//! @file GUI/Views/Toplevel/ImportDataView.h
//! @brief Defines class ImportDataView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
#include "GUI/CommonWidgets/ItemStackPresenter.h"
#include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
@@ -42,4 +42,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
diff --git a/GUI/Views/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
similarity index 98%
rename from GUI/Views/ProjectSettingsView.cpp
rename to GUI/Views/Toplevel/ProjectSettingsView.cpp
index 14b7ea0daa0..8dd5b2e7293 100644
--- a/GUI/Views/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/ProjectSettingsView.cpp
+//! @file GUI/Views/Toplevel/ProjectSettingsView.cpp
//! @brief Implements class ProjectSettingsView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/ProjectSettingsView.h"
+#include "GUI/Views/Toplevel/ProjectSettingsView.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
diff --git a/GUI/Views/ProjectSettingsView.h b/GUI/Views/Toplevel/ProjectSettingsView.h
similarity index 85%
rename from GUI/Views/ProjectSettingsView.h
rename to GUI/Views/Toplevel/ProjectSettingsView.h
index 8c961e8c603..74bec93f37f 100644
--- a/GUI/Views/ProjectSettingsView.h
+++ b/GUI/Views/Toplevel/ProjectSettingsView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/ProjectSettingsView.h
+//! @file GUI/Views/Toplevel/ProjectSettingsView.h
//! @brief Defines class ProjectSettingsView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
#include "GUI/Project/projectdocument.h"
#include <QWidget>
@@ -50,4 +50,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
diff --git a/GUI/Views/ProjectSettingsView.ui b/GUI/Views/Toplevel/ProjectSettingsView.ui
similarity index 100%
rename from GUI/Views/ProjectSettingsView.ui
rename to GUI/Views/Toplevel/ProjectSettingsView.ui
diff --git a/GUI/Views/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
similarity index 98%
rename from GUI/Views/SampleView.cpp
rename to GUI/Views/Toplevel/SampleView.cpp
index a472d93cb0b..6eb9e8ec2b5 100644
--- a/GUI/Views/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SampleView.cpp
+//! @file GUI/Views/Toplevel/SampleView.cpp
//! @brief Implements class SampleView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/SampleView.h"
+#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Session/MultiLayerItem.h"
diff --git a/GUI/Views/SampleView.h b/GUI/Views/Toplevel/SampleView.h
similarity index 86%
rename from GUI/Views/SampleView.h
rename to GUI/Views/Toplevel/SampleView.h
index 8947d9fd08f..fa0856d4574 100644
--- a/GUI/Views/SampleView.h
+++ b/GUI/Views/Toplevel/SampleView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SampleView.h
+//! @file GUI/Views/Toplevel/SampleView.h
//! @brief Defines class SampleView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_SAMPLEVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_SAMPLEVIEW_H
#include <QMainWindow>
@@ -44,4 +44,4 @@ private:
bool m_useLayerOrientedEditor = false;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_SAMPLEVIEW_H
diff --git a/GUI/Views/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
similarity index 93%
rename from GUI/Views/SessionModelView.cpp
rename to GUI/Views/Toplevel/SessionModelView.cpp
index 65cca26b6c3..92e95c2a4ad 100644
--- a/GUI/Views/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SessionModelView.cpp
+//! @file GUI/Views/Toplevel/SessionModelView.cpp
//! @brief Implements class SessionModelView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,15 +12,15 @@
//
// ************************************************************************************************
-#include "GUI/Views/SessionModelView.h"
+#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/CommonWidgets/ModelTreeView.h"
-#include "GUI/Views/SessionModelDelegate.h"
-#include "GUI/Views/TestView.h"
+#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
+#include "GUI/Views/Toplevel/TestView.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/Project/projectdocument.h"
#include "GUI/Project/projectmanager.h"
diff --git a/GUI/Views/SessionModelView.h b/GUI/Views/Toplevel/SessionModelView.h
similarity index 87%
rename from GUI/Views/SessionModelView.h
rename to GUI/Views/Toplevel/SessionModelView.h
index b0d4b0781be..4bd2d4eea36 100644
--- a/GUI/Views/SessionModelView.h
+++ b/GUI/Views/Toplevel/SessionModelView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SessionModelView.h
+//! @file GUI/Views/Toplevel/SessionModelView.h
//! @brief Defines class SessionModelView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SESSIONMODELVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SESSIONMODELVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_SESSIONMODELVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_SESSIONMODELVIEW_H
#include <QWidget>
@@ -55,4 +55,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_SESSIONMODELVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_SESSIONMODELVIEW_H
diff --git a/GUI/Views/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
similarity index 99%
rename from GUI/Views/SimulationView.cpp
rename to GUI/Views/Toplevel/SimulationView.cpp
index 348c08efad5..0bdd9cf0164 100644
--- a/GUI/Views/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SimulationView.cpp
+//! @file GUI/Views/Toplevel/SimulationView.cpp
//! @brief Implements class SimulationView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/SimulationView.h"
+#include "GUI/Views/Toplevel/SimulationView.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Session/InstrumentItems.h"
diff --git a/GUI/Views/SimulationView.h b/GUI/Views/Toplevel/SimulationView.h
similarity index 93%
rename from GUI/Views/SimulationView.h
rename to GUI/Views/Toplevel/SimulationView.h
index fb7ccd64025..bb18a1fa1fb 100644
--- a/GUI/Views/SimulationView.h
+++ b/GUI/Views/Toplevel/SimulationView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SimulationView.h
+//! @file GUI/Views/Toplevel/SimulationView.h
//! @brief Defines class SimulationView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SIMULATIONVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SIMULATIONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_SIMULATIONVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_SIMULATIONVIEW_H
#include <QWidget>
@@ -91,4 +91,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_SIMULATIONVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_SIMULATIONVIEW_H
diff --git a/GUI/Views/SimulationView.ui b/GUI/Views/Toplevel/SimulationView.ui
similarity index 100%
rename from GUI/Views/SimulationView.ui
rename to GUI/Views/Toplevel/SimulationView.ui
diff --git a/GUI/Views/TestView.cpp b/GUI/Views/Toplevel/TestView.cpp
similarity index 98%
rename from GUI/Views/TestView.cpp
rename to GUI/Views/Toplevel/TestView.cpp
index 02a841ee029..b493893d92c 100644
--- a/GUI/Views/TestView.cpp
+++ b/GUI/Views/Toplevel/TestView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/TestView.cpp
+//! @file GUI/Views/Toplevel/TestView.cpp
//! @brief Implements class TestView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/TestView.h"
+#include "GUI/Views/Toplevel/TestView.h"
#include "GUI/Session/Data1DViewItem.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Session/JobItem.h"
diff --git a/GUI/Views/TestView.h b/GUI/Views/Toplevel/TestView.h
similarity index 82%
rename from GUI/Views/TestView.h
rename to GUI/Views/Toplevel/TestView.h
index c5675e154a3..8468db736a3 100644
--- a/GUI/Views/TestView.h
+++ b/GUI/Views/Toplevel/TestView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/TestView.h
+//! @file GUI/Views/Toplevel/TestView.h
//! @brief Defines class TestView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TESTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TESTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_TESTVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_TESTVIEW_H
#include <QWidget>
@@ -33,4 +33,4 @@ private:
MainWindow* m_mainWindow;
};
-#endif // BORNAGAIN_GUI_VIEWS_TESTVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_TESTVIEW_H
diff --git a/GUI/Views/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
similarity index 96%
rename from GUI/Views/WelcomeView.cpp
rename to GUI/Views/Toplevel/WelcomeView.cpp
index 5c336c57ecf..a0b0417020f 100644
--- a/GUI/Views/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/WelcomeView.cpp
+//! @file GUI/Views/Toplevel/WelcomeView.cpp
//! @brief Implements class WelcomeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/WelcomeView.h"
+#include "GUI/Views/Toplevel/WelcomeView.h"
#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Project/projectmanager.h"
#include "GUI/utils/LayoutUtils.h"
diff --git a/GUI/Views/WelcomeView.h b/GUI/Views/Toplevel/WelcomeView.h
similarity index 80%
rename from GUI/Views/WelcomeView.h
rename to GUI/Views/Toplevel/WelcomeView.h
index 7a178c23cdc..b2a5e31519a 100644
--- a/GUI/Views/WelcomeView.h
+++ b/GUI/Views/Toplevel/WelcomeView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/WelcomeView.h
+//! @file GUI/Views/Toplevel/WelcomeView.h
//! @brief Defines class WelcomeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_WELCOMEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_WELCOMEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_WELCOMEVIEW_H
+#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_WELCOMEVIEW_H
#include <QWidget>
@@ -35,4 +35,4 @@ private:
Ui::WelcomeView* m_ui;
};
-#endif // BORNAGAIN_GUI_VIEWS_WELCOMEVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_WELCOMEVIEW_H
diff --git a/GUI/Views/WelcomeView.ui b/GUI/Views/Toplevel/WelcomeView.ui
similarity index 100%
rename from GUI/Views/WelcomeView.ui
rename to GUI/Views/Toplevel/WelcomeView.ui
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index 07a29987f2c..6a7c537d800 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -17,7 +17,7 @@
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/Application.h"
#include "GUI/Views/JobWidgets/JobView.h"
-#include "GUI/Views/SampleView.h"
+#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/PyImportAssistant.h"
#include "GUI/mainwindow/aboutapplicationdialog.h"
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index dacb401753f..17bb902de0d 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -16,15 +16,15 @@
#include "GUI/Application/Application.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Views/ImportDataView.h"
+#include "GUI/Views/Toplevel/ImportDataView.h"
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
#include "GUI/Views/JobWidgets/JobView.h"
-#include "GUI/Views/ProjectSettingsView.h"
-#include "GUI/Views/SampleView.h"
-#include "GUI/Views/SessionModelView.h"
-#include "GUI/Views/SimulationView.h"
+#include "GUI/Views/Toplevel/ProjectSettingsView.h"
+#include "GUI/Views/Toplevel/SampleView.h"
+#include "GUI/Views/Toplevel/SessionModelView.h"
+#include "GUI/Views/Toplevel/SimulationView.h"
#include "GUI/utils/mainwindow_constants.h"
-#include "GUI/Views/WelcomeView.h"
+#include "GUI/Views/Toplevel/WelcomeView.h"
#include "GUI/mainwindow/actionmanager.h"
#include "GUI/Project/projectmanager.h"
#include "GUI/utils/Helpers.h"
--
GitLab