diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index a1cba9eb6064df6580125924a3c9d4e113b9b018..f1a27acde5a506257beb6e5f4f1b0fa108f82851 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 4d8fca988ed2ac4e37ca70807365c142f8dd8e6a..d6637cd42ae38a0da9bfee843597e941fc36cb72 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 474646567aa8ed2a0e29d81db8954467a601ff18..24e2c456269fd0cab361f9ba52974e47a9aa3d01 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 ff6f0f20e124314ddf0fc383ddf439015345645c..50141e0da9112f0876e6a875703488789b7742dd 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 33f423756a8b2d691b32f3ab44282518979c9be8..104c9c889875a83627459631c04b1c807cecfbdb 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 c9d995e61c0ed5b33b79efcd18665f7151779345..2b3fc2820ee4e31007fa7fc9557cb042cf4125a1 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 6232354d9061a2001f5c7e2a307d9030845dacff..5eab58a288a06fc975829184f0081f63e97e2342 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 52a18cb4a1e3e4a64a136007e4a1981c77de877e..fdc54d9c0c0698f0c4fc0f1493c1ef67255bd8f3 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 e2d67d2fa3b27dbfebcebecb83c1f52092b85b12..583979c1a125b3c314c03fa216c48308cc9b7a55 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 9957e155fe2f3de6c0e46a8571d6d43aef708370..c2e1013546c498741cb992a2c036d38581c3448d 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 14b7ea0daa0bcf91628d29691f0f8bdf2a914189..8dd5b2e729394df9d005c465b43c6691780620f3 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 8c961e8c603671f78775992f7b1ee207fea9d356..74bec93f37f6e8370bfb935b737581dceb433479 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 a472d93cb0bd0d855a38932eebeb12739bba63d9..6eb9e8ec2b5aecd3ece354b9e4f7cef2e2526a61 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 8947d9fd08f240fa95af91acb434e02a4443bc54..fa0856d4574f71a3bd1378dbd6dbe73b97b074a9 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 65cca26b6c34f3629975dd615eb36b433b543581..92e95c2a4adb8190a9a4a5eebf6cf77782661c97 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 b0d4b0781be1ef7b09db52305f901506791294f0..4bd2d4eea36f9d1d1632c397ea97f57b7e766f2a 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 348c08efad5b28c64ac83393e08326d29fb5dbaf..0bdd9cf0164895d8dc231810da92f46618418ff3 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 fb7ccd6402532923ac1b5f7848077742d32f813f..bb18a1fa1fb4c9e959047eafd7c063464b32a22d 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 02a841ee0290dd93ce877e62e400e363f6b85ed6..b493893d92cfe96faf3bd68f9bb04369ba3aafbd 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 c5675e154a3ca47034b45c599f2f135d5ddad5a2..8468db736a305e4b4be47962e65584b20f592f24 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 5c336c57ecffdd66badb5b0244bd4eb34fe5e108..a0b0417020ff5b2f2fbcc2ef801692c34873f609 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 7a178c23cdc2ae8a605d8c7a8a8510b1456df2cd..b2a5e31519a31fd64bb4afe780cc78760e2369fe 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 07a29987f2c42920420f8f1d767ee1f1b8010c43..6a7c537d8000ccfa4ede552617028dd482b3d8fc 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 dacb401753f825c8509d6e8083e5fb522c0f3ca7..17bb902de0d519986aad9a96a070c94d4935095c 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"