From db9b0bc03e562b1c714749934475c2a64dee486b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 1 Nov 2021 22:09:30 +0100
Subject: [PATCH] new directories GUI/Project etc to decouple includes
---
.../CommonWidgets/AdjustingScrollArea.cpp | 4 ++--
.../CommonWidgets/AdjustingScrollArea.h | 8 ++++----
GUI/{Views => }/CommonWidgets/DesignerHelper.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/DesignerHelper.h | 8 ++++----
GUI/{Views => }/CommonWidgets/DockWidgetInfo.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/DockWidgetInfo.h | 8 ++++----
GUI/{Views => }/CommonWidgets/DocksController.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/DocksController.h | 10 +++++-----
GUI/{Views => }/CommonWidgets/DoubleLineEdit.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/DoubleLineEdit.h | 8 ++++----
GUI/{Views => }/CommonWidgets/DoubleSpinBox.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/DoubleSpinBox.h | 8 ++++----
GUI/{Views => }/CommonWidgets/GUIHelpers.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/GUIHelpers.h | 8 ++++----
.../CommonWidgets/GroupBoxCollapser.cpp | 2 +-
GUI/{Views => }/CommonWidgets/GroupBoxCollapser.h | 8 ++++----
GUI/{Views => }/CommonWidgets/InfoPanel.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/InfoPanel.h | 8 ++++----
GUI/{Views => }/CommonWidgets/InfoPanelToolBar.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/InfoPanelToolBar.h | 10 +++++-----
GUI/{Views => }/CommonWidgets/ItemComboToolBar.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/ItemComboToolBar.h | 10 +++++-----
GUI/{Views => }/CommonWidgets/ItemComboWidget.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/ItemComboWidget.h | 10 +++++-----
.../CommonWidgets/ItemSelectorWidget.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/ItemSelectorWidget.h | 8 ++++----
GUI/{Views => }/CommonWidgets/ItemStackPresenter.h | 10 +++++-----
GUI/{Views => }/CommonWidgets/ItemStackWidget.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/ItemStackWidget.h | 8 ++++----
.../CommonWidgets/ItemViewOverlayButtons.cpp | 2 +-
.../CommonWidgets/ItemViewOverlayButtons.h | 8 ++++----
GUI/{Views => }/CommonWidgets/ModelTreeView.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/ModelTreeView.h | 8 ++++----
.../CommonWidgets/ScientificSpinBox.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/ScientificSpinBox.h | 8 ++++----
.../CommonWidgets/SessionItemController.cpp | 4 ++--
.../CommonWidgets/SessionItemController.h | 8 ++++----
.../CommonWidgets/SessionItemWidget.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/SessionItemWidget.h | 8 ++++----
GUI/{Views => }/CommonWidgets/StatusLabel.cpp | 6 +++---
GUI/{Views => }/CommonWidgets/StatusLabel.h | 8 ++++----
GUI/{Views => }/CommonWidgets/StyleUtils.cpp | 8 ++++----
GUI/{Views => }/CommonWidgets/StyleUtils.h | 8 ++++----
GUI/{Views => }/CommonWidgets/StyledToolBar.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/StyledToolBar.h | 8 ++++----
GUI/{Views => }/CommonWidgets/UpdateTimer.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/UpdateTimer.h | 8 ++++----
GUI/{Views => }/CommonWidgets/detailsbutton.cpp | 2 +-
GUI/{Views => }/CommonWidgets/detailsbutton.h | 6 +++---
GUI/{Views => }/CommonWidgets/detailswidget.cpp | 4 ++--
GUI/{Views => }/CommonWidgets/detailswidget.h | 6 +++---
GUI/{Views => }/InfoWidgets/CautionSign.cpp | 6 +++---
GUI/{Views => }/InfoWidgets/CautionSign.h | 8 ++++----
GUI/{Views => }/InfoWidgets/CautionSignWidget.cpp | 4 ++--
GUI/{Views => }/InfoWidgets/CautionSignWidget.h | 8 ++++----
.../InfoWidgets/ComboSelectorDialog.cpp | 4 ++--
GUI/{Views => }/InfoWidgets/ComboSelectorDialog.h | 8 ++++----
GUI/{Views => }/InfoWidgets/DetailedMessageBox.cpp | 4 ++--
GUI/{Views => }/InfoWidgets/DetailedMessageBox.h | 8 ++++----
.../InfoWidgets/OverlayLabelController.cpp | 6 +++---
.../InfoWidgets/OverlayLabelController.h | 8 ++++----
GUI/{Views => }/InfoWidgets/OverlayLabelWidget.cpp | 8 ++++----
GUI/{Views => }/InfoWidgets/OverlayLabelWidget.h | 8 ++++----
.../InfoWidgets/ProjectLoadProblemDialog.cpp | 6 +++---
.../InfoWidgets/ProjectLoadProblemDialog.h | 8 ++++----
.../InfoWidgets/PythonSyntaxHighlighter.cpp | 4 ++--
.../InfoWidgets/PythonSyntaxHighlighter.h | 8 ++++----
GUI/Models/RealDataItem.cpp | 2 +-
GUI/Models/SampleListModel.cpp | 2 +-
GUI/{mainwindow => Project}/ProjectUtils.cpp | 6 +++---
GUI/{mainwindow => Project}/ProjectUtils.h | 8 ++++----
GUI/{mainwindow => Project}/projectdocument.cpp | 6 +++---
GUI/{mainwindow => Project}/projectdocument.h | 8 ++++----
GUI/{mainwindow => Project}/projectmanager.cpp | 14 +++++++-------
GUI/{mainwindow => Project}/projectmanager.h | 10 +++++-----
GUI/Views/FitWidgets/FitActivityPanel.cpp | 2 +-
GUI/Views/FitWidgets/FitParameterWidget.cpp | 4 ++--
GUI/Views/FitWidgets/FitParameterWidget.h | 2 +-
GUI/Views/FitWidgets/FitSessionWidget.cpp | 2 +-
GUI/Views/FitWidgets/JobRealTimeToolBar.h | 2 +-
GUI/Views/FitWidgets/JobRealTimeWidget.cpp | 2 +-
GUI/Views/FitWidgets/JobRealTimeWidget.h | 2 +-
GUI/Views/FitWidgets/ParameterTuningDelegate.cpp | 2 +-
GUI/Views/FitWidgets/ParameterTuningWidget.cpp | 2 +-
GUI/Views/FitWidgets/ParameterTuningWidget.h | 2 +-
GUI/Views/FitWidgets/RunFitControlWidget.cpp | 6 +++---
GUI/Views/FitWidgets/RunFitControlWidget.h | 2 +-
GUI/Views/ImportDataView.cpp | 4 ++--
GUI/Views/ImportDataView.h | 2 +-
GUI/Views/ImportDataWidgets/RealDataMaskWidget.h | 2 +-
GUI/Views/ImportDataWidgets/RealDataPresenter.h | 2 +-
.../ImportDataWidgets/RealDataPropertiesWidget.cpp | 2 +-
.../ImportDataWidgets/RealDataSelectorWidget.cpp | 10 +++++-----
.../DepthProbeInstrumentEditor.cpp | 2 +-
GUI/Views/InstrumentWidgets/DistributionForms.cpp | 2 +-
GUI/Views/InstrumentWidgets/DistributionPlot.cpp | 2 +-
.../InstrumentWidgets/GISASInstrumentEditor.cpp | 2 +-
.../InstrumentWidgets/InstrumentLibraryEditor.cpp | 4 ++--
GUI/Views/InstrumentWidgets/InstrumentListView.cpp | 2 +-
GUI/Views/InstrumentWidgets/InstrumentView.cpp | 4 ++--
.../OffSpecularInstrumentEditor.cpp | 2 +-
.../InstrumentWidgets/SpecularInstrumentEditor.cpp | 2 +-
GUI/Views/IntensityDataWidgets/ColorMap.cpp | 2 +-
GUI/Views/IntensityDataWidgets/ColorMapCanvas.h | 2 +-
GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp | 2 +-
.../IntensityDataWidgets/IntensityDataCanvas.cpp | 4 ++--
.../IntensityDataWidgets/IntensityDataCanvas.h | 2 +-
.../IntensityDataPropertyWidget.cpp | 2 +-
.../IntensityDataPropertyWidget.h | 2 +-
.../IntensityDataWidgets/IntensityDataWidget.h | 2 +-
GUI/Views/IntensityDataWidgets/Plot1D.cpp | 2 +-
GUI/Views/IntensityDataWidgets/PlotStatusLabel.h | 2 +-
GUI/Views/IntensityDataWidgets/ScientificPlot.h | 2 +-
GUI/Views/IntensityDataWidgets/plot_constants.h | 2 +-
GUI/Views/JobWidgets/FitComparisonWidget.h | 2 +-
GUI/Views/JobWidgets/FitComparisonWidget1D.h | 2 +-
GUI/Views/JobWidgets/FitFlowWidget.h | 2 +-
GUI/Views/JobWidgets/JobListView.cpp | 2 +-
GUI/Views/JobWidgets/JobMessagePanel.cpp | 2 +-
GUI/Views/JobWidgets/JobMessagePanel.h | 2 +-
GUI/Views/JobWidgets/JobPropertiesWidget.cpp | 4 ++--
GUI/Views/JobWidgets/JobResultsPresenter.h | 2 +-
GUI/Views/JobWidgets/JobSelectorWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobView.cpp | 4 ++--
GUI/Views/JobWidgets/JobViewActivities.cpp | 2 +-
GUI/Views/MaskWidgets/MaskEditorCanvas.cpp | 2 +-
GUI/Views/MaskWidgets/MaskEditorToolBar.cpp | 2 +-
GUI/Views/MaterialEditor/MaterialEditorDialog.cpp | 8 ++++----
GUI/Views/ProjectSettingsView.cpp | 4 ++--
GUI/Views/ProjectSettingsView.h | 2 +-
.../IntensityDataProjectionsWidget.h | 2 +-
GUI/Views/ProjectionsWidgets/ProjectionsPlot.h | 2 +-
.../ProjectionsWidgets/ProjectionsPropertyPanel.h | 2 +-
.../ProjectionsWidgets/ProjectionsToolBar.cpp | 2 +-
GUI/Views/ProjectionsWidgets/ProjectionsWidget.h | 2 +-
.../SaveProjectionsAssistant.cpp | 4 ++--
GUI/Views/PropertyEditor/ComponentTreeView.cpp | 2 +-
GUI/Views/PropertyEditor/CustomEditors.cpp | 4 ++--
GUI/Views/PropertyEditor/PropertyEditorFactory.cpp | 2 +-
GUI/Views/PropertyEditor/TestComponentView.cpp | 2 +-
GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp | 4 ++--
GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp | 2 +-
GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h | 2 +-
GUI/Views/SampleDesigner/ConnectableView.cpp | 4 ++--
GUI/Views/SampleDesigner/DesignerMimeData.cpp | 2 +-
GUI/Views/SampleDesigner/DesignerScene.cpp | 4 ++--
GUI/Views/SampleDesigner/FormLayouter.cpp | 4 ++--
GUI/Views/SampleDesigner/ILayerView.cpp | 2 +-
GUI/Views/SampleDesigner/InterferenceForm.cpp | 2 +-
GUI/Views/SampleDesigner/InterferenceViews.cpp | 2 +-
GUI/Views/SampleDesigner/LayerEditorUtils.cpp | 2 +-
GUI/Views/SampleDesigner/LayerForm.cpp | 2 +-
.../SampleDesigner/LayerOrientedSampleEditor.cpp | 2 +-
GUI/Views/SampleDesigner/LayerView.cpp | 2 +-
GUI/Views/SampleDesigner/MaterialInplaceForm.cpp | 6 +++---
GUI/Views/SampleDesigner/MesoCrystalForm.cpp | 2 +-
GUI/Views/SampleDesigner/MesoCrystalView.cpp | 4 ++--
GUI/Views/SampleDesigner/MultiLayerForm.cpp | 4 ++--
GUI/Views/SampleDesigner/MultiLayerView.cpp | 2 +-
GUI/Views/SampleDesigner/NodeEditorPort.cpp | 4 ++--
.../SampleDesigner/ParticleCompositionForm.cpp | 2 +-
.../SampleDesigner/ParticleCompositionView.cpp | 4 ++--
GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleCoreShellView.cpp | 4 ++--
GUI/Views/SampleDesigner/ParticleForm.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleLayoutForm.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleLayoutView.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleView.cpp | 4 ++--
.../SampleDesigner/SampleEditorController.cpp | 2 +-
GUI/Views/SampleDesigner/SampleListView.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBar.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBar.h | 2 +-
GUI/Views/SampleDesigner/SampleViewAligner.cpp | 2 +-
GUI/Views/SampleDesigner/ScriptPanel.cpp | 8 ++++----
GUI/Views/SampleDesigner/ScriptPanel.h | 2 +-
GUI/Views/SampleDesigner/TransformationView.cpp | 2 +-
GUI/Views/SampleView.cpp | 4 ++--
GUI/Views/SessionModelView.cpp | 6 +++---
GUI/Views/SimulationView.cpp | 6 +++---
GUI/Views/SimulationWidgets/PythonScriptWidget.cpp | 10 +++++-----
GUI/Views/SpecularDataWidgets/Plot1DCanvas.h | 2 +-
.../SpecularDataWidgets/SpecularDataCanvas.cpp | 2 +-
GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h | 2 +-
.../SpecularDataWidgets/SpecularDataImportWidget.h | 2 +-
GUI/Views/SpecularDataWidgets/SpecularDataWidget.h | 2 +-
GUI/Views/SpecularDataWidgets/SpecularPlot.cpp | 2 +-
GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h | 2 +-
GUI/Views/WelcomeView.cpp | 4 ++--
GUI/mainwindow/AutosaveController.cpp | 6 +++---
GUI/mainwindow/OutputDataIOService.cpp | 2 +-
GUI/mainwindow/PyImportAssistant.cpp | 10 +++++-----
GUI/mainwindow/SaveService.cpp | 4 ++--
GUI/mainwindow/SaveThread.cpp | 2 +-
GUI/mainwindow/aboutapplicationdialog.cpp | 2 +-
GUI/mainwindow/actionmanager.cpp | 4 ++--
GUI/mainwindow/mainwindow.cpp | 4 ++--
GUI/mainwindow/newprojectdialog.cpp | 2 +-
GUI/{Views/Tools => utils}/mainwindow_constants.h | 8 ++++----
Tests/Unit/GUI/TestDataItemViews.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 4 ++--
Tests/Unit/GUI/TestProjectUtils.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 4 ++--
Tests/Unit/GUI/TestSavingSpecularData.cpp | 2 +-
Tests/Unit/GUI/TestScientificSpinBox.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemController.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemControllerHelper.cpp | 2 +-
Tests/Unit/GUI/TestUpdateTimer.cpp | 2 +-
Tests/Unit/GUI/Utils.cpp | 2 +-
210 files changed, 439 insertions(+), 439 deletions(-)
rename GUI/{Views => }/CommonWidgets/AdjustingScrollArea.cpp (92%)
rename GUI/{Views => }/CommonWidgets/AdjustingScrollArea.h (78%)
rename GUI/{Views => }/CommonWidgets/DesignerHelper.cpp (98%)
rename GUI/{Views => }/CommonWidgets/DesignerHelper.h (91%)
rename GUI/{Views => }/CommonWidgets/DockWidgetInfo.cpp (90%)
rename GUI/{Views => }/CommonWidgets/DockWidgetInfo.h (80%)
rename GUI/{Views => }/CommonWidgets/DocksController.cpp (98%)
rename GUI/{Views => }/CommonWidgets/DocksController.h (87%)
rename GUI/{Views => }/CommonWidgets/DoubleLineEdit.cpp (91%)
rename GUI/{Views => }/CommonWidgets/DoubleLineEdit.h (87%)
rename GUI/{Views => }/CommonWidgets/DoubleSpinBox.cpp (94%)
rename GUI/{Views => }/CommonWidgets/DoubleSpinBox.h (90%)
rename GUI/{Views => }/CommonWidgets/GUIHelpers.cpp (98%)
rename GUI/{Views => }/CommonWidgets/GUIHelpers.h (87%)
rename GUI/{Views => }/CommonWidgets/GroupBoxCollapser.cpp (98%)
rename GUI/{Views => }/CommonWidgets/GroupBoxCollapser.h (90%)
rename GUI/{Views => }/CommonWidgets/InfoPanel.cpp (95%)
rename GUI/{Views => }/CommonWidgets/InfoPanel.h (86%)
rename GUI/{Views => }/CommonWidgets/InfoPanelToolBar.cpp (94%)
rename GUI/{Views => }/CommonWidgets/InfoPanelToolBar.h (76%)
rename GUI/{Views => }/CommonWidgets/ItemComboToolBar.cpp (96%)
rename GUI/{Views => }/CommonWidgets/ItemComboToolBar.h (83%)
rename GUI/{Views => }/CommonWidgets/ItemComboWidget.cpp (96%)
rename GUI/{Views => }/CommonWidgets/ItemComboWidget.h (89%)
rename GUI/{Views => }/CommonWidgets/ItemSelectorWidget.cpp (95%)
rename GUI/{Views => }/CommonWidgets/ItemSelectorWidget.h (88%)
rename GUI/{Views => }/CommonWidgets/ItemStackPresenter.h (91%)
rename GUI/{Views => }/CommonWidgets/ItemStackWidget.cpp (96%)
rename GUI/{Views => }/CommonWidgets/ItemStackWidget.h (87%)
rename GUI/{Views => }/CommonWidgets/ItemViewOverlayButtons.cpp (99%)
rename GUI/{Views => }/CommonWidgets/ItemViewOverlayButtons.h (81%)
rename GUI/{Views => }/CommonWidgets/ModelTreeView.cpp (92%)
rename GUI/{Views => }/CommonWidgets/ModelTreeView.h (84%)
rename GUI/{Views => }/CommonWidgets/ScientificSpinBox.cpp (97%)
rename GUI/{Views => }/CommonWidgets/ScientificSpinBox.h (88%)
rename GUI/{Views => }/CommonWidgets/SessionItemController.cpp (95%)
rename GUI/{Views => }/CommonWidgets/SessionItemController.h (84%)
rename GUI/{Views => }/CommonWidgets/SessionItemWidget.cpp (89%)
rename GUI/{Views => }/CommonWidgets/SessionItemWidget.h (85%)
rename GUI/{Views => }/CommonWidgets/StatusLabel.cpp (92%)
rename GUI/{Views => }/CommonWidgets/StatusLabel.h (85%)
rename GUI/{Views => }/CommonWidgets/StyleUtils.cpp (95%)
rename GUI/{Views => }/CommonWidgets/StyleUtils.h (88%)
rename GUI/{Views => }/CommonWidgets/StyledToolBar.cpp (93%)
rename GUI/{Views => }/CommonWidgets/StyledToolBar.h (80%)
rename GUI/{Views => }/CommonWidgets/UpdateTimer.cpp (93%)
rename GUI/{Views => }/CommonWidgets/UpdateTimer.h (85%)
rename GUI/{Views => }/CommonWidgets/detailsbutton.cpp (99%)
rename GUI/{Views => }/CommonWidgets/detailsbutton.h (92%)
rename GUI/{Views => }/CommonWidgets/detailswidget.cpp (99%)
rename GUI/{Views => }/CommonWidgets/detailswidget.h (94%)
rename GUI/{Views => }/InfoWidgets/CautionSign.cpp (95%)
rename GUI/{Views => }/InfoWidgets/CautionSign.h (85%)
rename GUI/{Views => }/InfoWidgets/CautionSignWidget.cpp (93%)
rename GUI/{Views => }/InfoWidgets/CautionSignWidget.h (83%)
rename GUI/{Views => }/InfoWidgets/ComboSelectorDialog.cpp (96%)
rename GUI/{Views => }/InfoWidgets/ComboSelectorDialog.h (83%)
rename GUI/{Views => }/InfoWidgets/DetailedMessageBox.cpp (96%)
rename GUI/{Views => }/InfoWidgets/DetailedMessageBox.h (84%)
rename GUI/{Views => }/InfoWidgets/OverlayLabelController.cpp (91%)
rename GUI/{Views => }/InfoWidgets/OverlayLabelController.h (82%)
rename GUI/{Views => }/InfoWidgets/OverlayLabelWidget.cpp (87%)
rename GUI/{Views => }/InfoWidgets/OverlayLabelWidget.h (82%)
rename GUI/{Views => }/InfoWidgets/ProjectLoadProblemDialog.cpp (96%)
rename GUI/{Views => }/InfoWidgets/ProjectLoadProblemDialog.h (80%)
rename GUI/{Views => }/InfoWidgets/PythonSyntaxHighlighter.cpp (98%)
rename GUI/{Views => }/InfoWidgets/PythonSyntaxHighlighter.h (92%)
rename GUI/{mainwindow => Project}/ProjectUtils.cpp (91%)
rename GUI/{mainwindow => Project}/ProjectUtils.h (89%)
rename GUI/{mainwindow => Project}/projectdocument.cpp (98%)
rename GUI/{mainwindow => Project}/projectdocument.h (95%)
rename GUI/{mainwindow => Project}/projectmanager.cpp (97%)
rename GUI/{mainwindow => Project}/projectmanager.h (92%)
rename GUI/{Views/Tools => utils}/mainwindow_constants.h (90%)
diff --git a/GUI/Views/CommonWidgets/AdjustingScrollArea.cpp b/GUI/CommonWidgets/AdjustingScrollArea.cpp
similarity index 92%
rename from GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
rename to GUI/CommonWidgets/AdjustingScrollArea.cpp
index 7fd7697ce00..9f2e1bb361f 100644
--- a/GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
+++ b/GUI/CommonWidgets/AdjustingScrollArea.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
+//! @file GUI/CommonWidgets/AdjustingScrollArea.cpp
//! @brief Implements class AdjustingScrollArea
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/AdjustingScrollArea.h"
+#include "GUI/CommonWidgets/AdjustingScrollArea.h"
#include <QEvent>
#include <QScrollBar>
diff --git a/GUI/Views/CommonWidgets/AdjustingScrollArea.h b/GUI/CommonWidgets/AdjustingScrollArea.h
similarity index 78%
rename from GUI/Views/CommonWidgets/AdjustingScrollArea.h
rename to GUI/CommonWidgets/AdjustingScrollArea.h
index 67ad5532737..3a630562721 100644
--- a/GUI/Views/CommonWidgets/AdjustingScrollArea.h
+++ b/GUI/CommonWidgets/AdjustingScrollArea.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/AdjustingScrollArea.h
+//! @file GUI/CommonWidgets/AdjustingScrollArea.h
//! @brief Defines class AdjustingScrollArea
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
#include <QScrollArea>
@@ -33,4 +33,4 @@ private:
bool eventFilter(QObject* obj, QEvent* ev);
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
diff --git a/GUI/Views/CommonWidgets/DesignerHelper.cpp b/GUI/CommonWidgets/DesignerHelper.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/DesignerHelper.cpp
rename to GUI/CommonWidgets/DesignerHelper.cpp
index f603e9a0805..a06de8fd4f2 100644
--- a/GUI/Views/CommonWidgets/DesignerHelper.cpp
+++ b/GUI/CommonWidgets/DesignerHelper.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DesignerHelper.cpp
+//! @file GUI/CommonWidgets/DesignerHelper.cpp
//! @brief Implements class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Models/MaterialItemUtils.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QPainter>
#include <cmath>
#include <iostream>
diff --git a/GUI/Views/CommonWidgets/DesignerHelper.h b/GUI/CommonWidgets/DesignerHelper.h
similarity index 91%
rename from GUI/Views/CommonWidgets/DesignerHelper.h
rename to GUI/CommonWidgets/DesignerHelper.h
index 5190ce878b2..5e3f407af58 100644
--- a/GUI/Views/CommonWidgets/DesignerHelper.h
+++ b/GUI/CommonWidgets/DesignerHelper.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DesignerHelper.h
+//! @file GUI/CommonWidgets/DesignerHelper.h
//! @brief Defines class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DESIGNERHELPER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DESIGNERHELPER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
#include <QColor>
#include <QGradient>
@@ -75,4 +75,4 @@ public:
static int getPythonEditorFontSize();
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DESIGNERHELPER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
diff --git a/GUI/Views/CommonWidgets/DockWidgetInfo.cpp b/GUI/CommonWidgets/DockWidgetInfo.cpp
similarity index 90%
rename from GUI/Views/CommonWidgets/DockWidgetInfo.cpp
rename to GUI/CommonWidgets/DockWidgetInfo.cpp
index 62691898f55..24604063861 100644
--- a/GUI/Views/CommonWidgets/DockWidgetInfo.cpp
+++ b/GUI/CommonWidgets/DockWidgetInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DockWidgetInfo.cpp
+//! @file GUI/CommonWidgets/DockWidgetInfo.cpp
//! @brief Implements class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DockWidgetInfo.h"
+#include "GUI/CommonWidgets/DockWidgetInfo.h"
#include <QDockWidget>
#include <QWidget>
diff --git a/GUI/Views/CommonWidgets/DockWidgetInfo.h b/GUI/CommonWidgets/DockWidgetInfo.h
similarity index 80%
rename from GUI/Views/CommonWidgets/DockWidgetInfo.h
rename to GUI/CommonWidgets/DockWidgetInfo.h
index 5492ac4ff0c..88573a79e0d 100644
--- a/GUI/Views/CommonWidgets/DockWidgetInfo.h
+++ b/GUI/CommonWidgets/DockWidgetInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DockWidgetInfo.h
+//! @file GUI/CommonWidgets/DockWidgetInfo.h
//! @brief Defines class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
#include <qnamespace.h>
@@ -37,4 +37,4 @@ private:
Qt::DockWidgetArea m_area;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
diff --git a/GUI/Views/CommonWidgets/DocksController.cpp b/GUI/CommonWidgets/DocksController.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/DocksController.cpp
rename to GUI/CommonWidgets/DocksController.cpp
index ad5af54d7a7..08e4cb10235 100644
--- a/GUI/Views/CommonWidgets/DocksController.cpp
+++ b/GUI/CommonWidgets/DocksController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DocksController.cpp
+//! @file GUI/CommonWidgets/DocksController.cpp
//! @brief Implements class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DocksController.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
#include <QAbstractItemView>
diff --git a/GUI/Views/CommonWidgets/DocksController.h b/GUI/CommonWidgets/DocksController.h
similarity index 87%
rename from GUI/Views/CommonWidgets/DocksController.h
rename to GUI/CommonWidgets/DocksController.h
index 5972e1725cb..1d5a4f99a80 100644
--- a/GUI/Views/CommonWidgets/DocksController.h
+++ b/GUI/CommonWidgets/DocksController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DocksController.h
+//! @file GUI/CommonWidgets/DocksController.h
//! @brief Defines class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
-#include "GUI/Views/CommonWidgets/DockWidgetInfo.h"
+#include "GUI/CommonWidgets/DockWidgetInfo.h"
#include <QObject>
#include <QSize>
#include <map>
@@ -72,4 +72,4 @@ private:
bool m_handleDockVisibilityChanges = true;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
diff --git a/GUI/Views/CommonWidgets/DoubleLineEdit.cpp b/GUI/CommonWidgets/DoubleLineEdit.cpp
similarity index 91%
rename from GUI/Views/CommonWidgets/DoubleLineEdit.cpp
rename to GUI/CommonWidgets/DoubleLineEdit.cpp
index c4110275e85..54e48091da5 100644
--- a/GUI/Views/CommonWidgets/DoubleLineEdit.cpp
+++ b/GUI/CommonWidgets/DoubleLineEdit.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleLineEdit.cpp
+//! @file GUI/CommonWidgets/DoubleLineEdit.cpp
//! @brief Implements class DoubleLineEdit
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DoubleLineEdit.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/DoubleLineEdit.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include <QDoubleValidator>
DoubleLineEdit::DoubleLineEdit(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/Views/CommonWidgets/DoubleLineEdit.h b/GUI/CommonWidgets/DoubleLineEdit.h
similarity index 87%
rename from GUI/Views/CommonWidgets/DoubleLineEdit.h
rename to GUI/CommonWidgets/DoubleLineEdit.h
index d865ba8463d..398317b8cfe 100644
--- a/GUI/Views/CommonWidgets/DoubleLineEdit.h
+++ b/GUI/CommonWidgets/DoubleLineEdit.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleLineEdit.h
+//! @file GUI/CommonWidgets/DoubleLineEdit.h
//! @brief Defines class DoubleLineEdit
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLELINEEDIT_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLELINEEDIT_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
#include "GUI/Models/DoubleDescriptor.h"
#include <QLineEdit>
@@ -51,4 +51,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLELINEEDIT_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
diff --git a/GUI/Views/CommonWidgets/DoubleSpinBox.cpp b/GUI/CommonWidgets/DoubleSpinBox.cpp
similarity index 94%
rename from GUI/Views/CommonWidgets/DoubleSpinBox.cpp
rename to GUI/CommonWidgets/DoubleSpinBox.cpp
index c3ed8f23fb9..5ef8abc1933 100644
--- a/GUI/Views/CommonWidgets/DoubleSpinBox.cpp
+++ b/GUI/CommonWidgets/DoubleSpinBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleSpinBox.cpp
+//! @file GUI/CommonWidgets/DoubleSpinBox.cpp
//! @brief Implements class DoubleSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include <QWheelEvent>
DoubleSpinBox::DoubleSpinBox(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/Views/CommonWidgets/DoubleSpinBox.h b/GUI/CommonWidgets/DoubleSpinBox.h
similarity index 90%
rename from GUI/Views/CommonWidgets/DoubleSpinBox.h
rename to GUI/CommonWidgets/DoubleSpinBox.h
index 922ec6124c4..26182d78b98 100644
--- a/GUI/Views/CommonWidgets/DoubleSpinBox.h
+++ b/GUI/CommonWidgets/DoubleSpinBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleSpinBox.h
+//! @file GUI/CommonWidgets/DoubleSpinBox.h
//! @brief Defines class DoubleSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLESPINBOX_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLESPINBOX_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
#include "GUI/Models/DoubleDescriptor.h"
#include <QDoubleSpinBox>
@@ -73,4 +73,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLESPINBOX_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
diff --git a/GUI/Views/CommonWidgets/GUIHelpers.cpp b/GUI/CommonWidgets/GUIHelpers.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/GUIHelpers.cpp
rename to GUI/CommonWidgets/GUIHelpers.cpp
index f7175c6832a..43a84aeeeaf 100644
--- a/GUI/Views/CommonWidgets/GUIHelpers.cpp
+++ b/GUI/CommonWidgets/GUIHelpers.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GUIHelpers.cpp
+//! @file GUI/CommonWidgets/GUIHelpers.cpp
//! @brief Implements GUIHelpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include "Fit/Param/RealLimits.h"
#include "GUI/Models/Error.h"
#include <QApplication>
diff --git a/GUI/Views/CommonWidgets/GUIHelpers.h b/GUI/CommonWidgets/GUIHelpers.h
similarity index 87%
rename from GUI/Views/CommonWidgets/GUIHelpers.h
rename to GUI/CommonWidgets/GUIHelpers.h
index 6d663ccd066..1a323231a34 100644
--- a/GUI/Views/CommonWidgets/GUIHelpers.h
+++ b/GUI/CommonWidgets/GUIHelpers.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GUIHelpers.h
+//! @file GUI/CommonWidgets/GUIHelpers.h
//! @brief Defines class GUIHelpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GUIHELPERS_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GUIHELPERS_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_GUIHELPERS_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_GUIHELPERS_H
#include <QWidget>
@@ -45,4 +45,4 @@ void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limi
} // namespace GUI::View::Helpers
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GUIHELPERS_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_GUIHELPERS_H
diff --git a/GUI/Views/CommonWidgets/GroupBoxCollapser.cpp b/GUI/CommonWidgets/GroupBoxCollapser.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/GroupBoxCollapser.cpp
rename to GUI/CommonWidgets/GroupBoxCollapser.cpp
index 500a0e13d8a..17719ed23e2 100644
--- a/GUI/Views/CommonWidgets/GroupBoxCollapser.cpp
+++ b/GUI/CommonWidgets/GroupBoxCollapser.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GroupBoxCollapser.cpp
+//! @file GUI/CommonWidgets/GroupBoxCollapser.cpp
//! @brief Implements class GroupBoxCollapser
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/Views/CommonWidgets/GroupBoxCollapser.h b/GUI/CommonWidgets/GroupBoxCollapser.h
similarity index 90%
rename from GUI/Views/CommonWidgets/GroupBoxCollapser.h
rename to GUI/CommonWidgets/GroupBoxCollapser.h
index b1d62bb543a..167c8252fbd 100644
--- a/GUI/Views/CommonWidgets/GroupBoxCollapser.h
+++ b/GUI/CommonWidgets/GroupBoxCollapser.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GroupBoxCollapser.h
+//! @file GUI/CommonWidgets/GroupBoxCollapser.h
//! @brief Defines class GroupBoxCollapser
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
#include <QObject>
@@ -62,4 +62,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
diff --git a/GUI/Views/CommonWidgets/InfoPanel.cpp b/GUI/CommonWidgets/InfoPanel.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/InfoPanel.cpp
rename to GUI/CommonWidgets/InfoPanel.cpp
index c8643c5fe38..5f85716bde0 100644
--- a/GUI/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/CommonWidgets/InfoPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanel.cpp
+//! @file GUI/CommonWidgets/InfoPanel.cpp
//! @brief Declares class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/InfoPanel.h"
-#include "GUI/Views/CommonWidgets/InfoPanelToolBar.h"
+#include "GUI/CommonWidgets/InfoPanel.h"
+#include "GUI/CommonWidgets/InfoPanelToolBar.h"
#include <QBoxLayout>
#include <QResizeEvent>
#include <QStackedWidget>
diff --git a/GUI/Views/CommonWidgets/InfoPanel.h b/GUI/CommonWidgets/InfoPanel.h
similarity index 86%
rename from GUI/Views/CommonWidgets/InfoPanel.h
rename to GUI/CommonWidgets/InfoPanel.h
index d676554584a..7112e212b1c 100644
--- a/GUI/Views/CommonWidgets/InfoPanel.h
+++ b/GUI/CommonWidgets/InfoPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanel.h
+//! @file GUI/CommonWidgets/InfoPanel.h
//! @brief Defines class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
#include <QFrame>
@@ -51,4 +51,4 @@ protected:
int m_cached_height;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
diff --git a/GUI/Views/CommonWidgets/InfoPanelToolBar.cpp b/GUI/CommonWidgets/InfoPanelToolBar.cpp
similarity index 94%
rename from GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
rename to GUI/CommonWidgets/InfoPanelToolBar.cpp
index 581e7234de5..abcd0f948f9 100644
--- a/GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
+++ b/GUI/CommonWidgets/InfoPanelToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
+//! @file GUI/CommonWidgets/InfoPanelToolBar.cpp
//! @brief Declares class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/InfoPanelToolBar.h"
+#include "GUI/CommonWidgets/InfoPanelToolBar.h"
#include <QAction>
#include <QHBoxLayout>
#include <QToolButton>
diff --git a/GUI/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/CommonWidgets/InfoPanelToolBar.h
similarity index 76%
rename from GUI/Views/CommonWidgets/InfoPanelToolBar.h
rename to GUI/CommonWidgets/InfoPanelToolBar.h
index bca753304a5..609b1e3782d 100644
--- a/GUI/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/CommonWidgets/InfoPanelToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanelToolBar.h
+//! @file GUI/CommonWidgets/InfoPanelToolBar.h
//! @brief Defines class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
class QAction;
@@ -41,4 +41,4 @@ private:
bool m_expanded;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
diff --git a/GUI/Views/CommonWidgets/ItemComboToolBar.cpp b/GUI/CommonWidgets/ItemComboToolBar.cpp
similarity index 96%
rename from GUI/Views/CommonWidgets/ItemComboToolBar.cpp
rename to GUI/CommonWidgets/ItemComboToolBar.cpp
index 3b40ad0ebe2..feb030a2f20 100644
--- a/GUI/Views/CommonWidgets/ItemComboToolBar.cpp
+++ b/GUI/CommonWidgets/ItemComboToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboToolBar.cpp
+//! @file GUI/CommonWidgets/ItemComboToolBar.cpp
//! @brief Implements class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemComboToolBar.h"
+#include "GUI/CommonWidgets/ItemComboToolBar.h"
#include "Base/Utils/Assert.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/Views/CommonWidgets/ItemComboToolBar.h b/GUI/CommonWidgets/ItemComboToolBar.h
similarity index 83%
rename from GUI/Views/CommonWidgets/ItemComboToolBar.h
rename to GUI/CommonWidgets/ItemComboToolBar.h
index 5d99cc91506..1de82ab6622 100644
--- a/GUI/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/CommonWidgets/ItemComboToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboToolBar.h
+//! @file GUI/CommonWidgets/ItemComboToolBar.h
//! @brief Defines class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include <QList>
class QAction;
@@ -51,4 +51,4 @@ private:
QAction* m_comboBoxAction;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/CommonWidgets/ItemComboWidget.cpp
similarity index 96%
rename from GUI/Views/CommonWidgets/ItemComboWidget.cpp
rename to GUI/CommonWidgets/ItemComboWidget.cpp
index 521f1215b9c..2c2d5d7fa3b 100644
--- a/GUI/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/CommonWidgets/ItemComboWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboWidget.cpp
+//! @file GUI/CommonWidgets/ItemComboWidget.cpp
//! @brief Implements class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemComboWidget.h"
+#include "GUI/CommonWidgets/ItemComboWidget.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/CommonWidgets/ItemComboToolBar.h"
+#include "GUI/CommonWidgets/ItemComboToolBar.h"
#include <QComboBox>
#include <QEvent>
#include <QStackedWidget>
diff --git a/GUI/Views/CommonWidgets/ItemComboWidget.h b/GUI/CommonWidgets/ItemComboWidget.h
similarity index 89%
rename from GUI/Views/CommonWidgets/ItemComboWidget.h
rename to GUI/CommonWidgets/ItemComboWidget.h
index dfcd7ea780e..7b1a7b98f25 100644
--- a/GUI/Views/CommonWidgets/ItemComboWidget.h
+++ b/GUI/CommonWidgets/ItemComboWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboWidget.h
+//! @file GUI/CommonWidgets/ItemComboWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
#include "Base/Utils/IFactory.h"
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QMap>
#include <QString>
#include <QWidget>
@@ -72,4 +72,4 @@ private:
QWidget* m_blankWidget;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
diff --git a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/CommonWidgets/ItemSelectorWidget.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
rename to GUI/CommonWidgets/ItemSelectorWidget.cpp
index 9d5ea274714..ec9d4f271cf 100644
--- a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/CommonWidgets/ItemSelectorWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
+//! @file GUI/CommonWidgets/ItemSelectorWidget.cpp
//! @brief Implements class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemSelectorWidget.h"
+#include "GUI/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/Models/SessionDecorationModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/CommonWidgets/ItemSelectorWidget.h
similarity index 88%
rename from GUI/Views/CommonWidgets/ItemSelectorWidget.h
rename to GUI/CommonWidgets/ItemSelectorWidget.h
index 9844759b582..fec70430b0f 100644
--- a/GUI/Views/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/CommonWidgets/ItemSelectorWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemSelectorWidget.h
+//! @file GUI/CommonWidgets/ItemSelectorWidget.h
//! @brief Defines class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
#include <QItemSelectionModel>
#include <QWidget>
@@ -69,4 +69,4 @@ protected:
std::unique_ptr<SessionDecorationModel> m_decorationModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
diff --git a/GUI/Views/CommonWidgets/ItemStackPresenter.h b/GUI/CommonWidgets/ItemStackPresenter.h
similarity index 91%
rename from GUI/Views/CommonWidgets/ItemStackPresenter.h
rename to GUI/CommonWidgets/ItemStackPresenter.h
index bc8cd31a5db..e1c34127539 100644
--- a/GUI/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/CommonWidgets/ItemStackPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemStackPresenter.h
+//! @file GUI/CommonWidgets/ItemStackPresenter.h
//! @brief Defines class ItemStackPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
#include "Base/Utils/Assert.h"
-#include "GUI/Views/CommonWidgets/ItemStackWidget.h"
+#include "GUI/CommonWidgets/ItemStackWidget.h"
#include <QMap>
#include <QStackedWidget>
@@ -132,4 +132,4 @@ template <class T> void ItemStackPresenter<T>::removeWidgets()
m_itemToWidget.clear();
}
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
diff --git a/GUI/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/CommonWidgets/ItemStackWidget.cpp
similarity index 96%
rename from GUI/Views/CommonWidgets/ItemStackWidget.cpp
rename to GUI/CommonWidgets/ItemStackWidget.cpp
index 41b99a637c2..21fc2672107 100644
--- a/GUI/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/CommonWidgets/ItemStackWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemStackWidget.cpp
+//! @file GUI/CommonWidgets/ItemStackWidget.cpp
//! @brief Implements class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemStackWidget.h"
+#include "GUI/CommonWidgets/ItemStackWidget.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionModel.h"
#include <QStackedWidget>
diff --git a/GUI/Views/CommonWidgets/ItemStackWidget.h b/GUI/CommonWidgets/ItemStackWidget.h
similarity index 87%
rename from GUI/Views/CommonWidgets/ItemStackWidget.h
rename to GUI/CommonWidgets/ItemStackWidget.h
index 5f40431f844..b0c69681ffd 100644
--- a/GUI/Views/CommonWidgets/ItemStackWidget.h
+++ b/GUI/CommonWidgets/ItemStackWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemStackWidget.h
+//! @file GUI/CommonWidgets/ItemStackWidget.h
//! @brief Defines class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
#include <QWidget>
@@ -56,4 +56,4 @@ protected:
QSize m_size_hint;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
diff --git a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp b/GUI/CommonWidgets/ItemViewOverlayButtons.cpp
similarity index 99%
rename from GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp
rename to GUI/CommonWidgets/ItemViewOverlayButtons.cpp
index 48cfb3646a8..c375da67efd 100644
--- a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp
+++ b/GUI/CommonWidgets/ItemViewOverlayButtons.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp
+//! @file GUI/CommonWidgets/ItemViewOverlayButtons.cpp
//! @brief Implements class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.h b/GUI/CommonWidgets/ItemViewOverlayButtons.h
similarity index 81%
rename from GUI/Views/CommonWidgets/ItemViewOverlayButtons.h
rename to GUI/CommonWidgets/ItemViewOverlayButtons.h
index 94846ef78ce..214ce41b330 100644
--- a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.h
+++ b/GUI/CommonWidgets/ItemViewOverlayButtons.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemViewOverlayButtons.h
+//! @file GUI/CommonWidgets/ItemViewOverlayButtons.h
//! @brief Defines class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TREEVIEWOVERLAYBUTTONS_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TREEVIEWOVERLAYBUTTONS_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
#include <QObject>
#include <functional>
@@ -42,4 +42,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TREEVIEWOVERLAYBUTTONS_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
diff --git a/GUI/Views/CommonWidgets/ModelTreeView.cpp b/GUI/CommonWidgets/ModelTreeView.cpp
similarity index 92%
rename from GUI/Views/CommonWidgets/ModelTreeView.cpp
rename to GUI/CommonWidgets/ModelTreeView.cpp
index 718ab420278..b01e17705dd 100644
--- a/GUI/Views/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/CommonWidgets/ModelTreeView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ModelTreeView.cpp
+//! @file GUI/CommonWidgets/ModelTreeView.cpp
//! @brief Implements class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ModelTreeView.h"
+#include "GUI/CommonWidgets/ModelTreeView.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionDecorationModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/CommonWidgets/ModelTreeView.h b/GUI/CommonWidgets/ModelTreeView.h
similarity index 84%
rename from GUI/Views/CommonWidgets/ModelTreeView.h
rename to GUI/CommonWidgets/ModelTreeView.h
index 3863ae66727..d28fcd58e69 100644
--- a/GUI/Views/CommonWidgets/ModelTreeView.h
+++ b/GUI/CommonWidgets/ModelTreeView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ModelTreeView.h
+//! @file GUI/CommonWidgets/ModelTreeView.h
//! @brief Defines class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
bool m_is_expanded;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
diff --git a/GUI/Views/CommonWidgets/ScientificSpinBox.cpp b/GUI/CommonWidgets/ScientificSpinBox.cpp
similarity index 97%
rename from GUI/Views/CommonWidgets/ScientificSpinBox.cpp
rename to GUI/CommonWidgets/ScientificSpinBox.cpp
index d5ff7c9c905..8eab7b326ad 100644
--- a/GUI/Views/CommonWidgets/ScientificSpinBox.cpp
+++ b/GUI/CommonWidgets/ScientificSpinBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ScientificSpinBox.cpp
+//! @file GUI/CommonWidgets/ScientificSpinBox.cpp
//! @brief Implements class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include <QLineEdit>
#include <cmath>
diff --git a/GUI/Views/CommonWidgets/ScientificSpinBox.h b/GUI/CommonWidgets/ScientificSpinBox.h
similarity index 88%
rename from GUI/Views/CommonWidgets/ScientificSpinBox.h
rename to GUI/CommonWidgets/ScientificSpinBox.h
index f18816fa4cf..9d8c19bc0d1 100644
--- a/GUI/Views/CommonWidgets/ScientificSpinBox.h
+++ b/GUI/CommonWidgets/ScientificSpinBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ScientificSpinBox.h
+//! @file GUI/CommonWidgets/ScientificSpinBox.h
//! @brief Defines class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SCIENTIFICSPINBOX_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
#include <QAbstractSpinBox>
@@ -66,4 +66,4 @@ private:
QDoubleValidator m_validator;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
diff --git a/GUI/Views/CommonWidgets/SessionItemController.cpp b/GUI/CommonWidgets/SessionItemController.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/SessionItemController.cpp
rename to GUI/CommonWidgets/SessionItemController.cpp
index 65c942574c3..6883869df04 100644
--- a/GUI/Views/CommonWidgets/SessionItemController.cpp
+++ b/GUI/CommonWidgets/SessionItemController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemController.cpp
+//! @file GUI/CommonWidgets/SessionItemController.cpp
//! @brief Implements class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
#include "GUI/Models/SessionItem.h"
SessionItemController::SessionItemController(QObject* prt)
diff --git a/GUI/Views/CommonWidgets/SessionItemController.h b/GUI/CommonWidgets/SessionItemController.h
similarity index 84%
rename from GUI/Views/CommonWidgets/SessionItemController.h
rename to GUI/CommonWidgets/SessionItemController.h
index e79e0266ee2..bf374a8f484 100644
--- a/GUI/Views/CommonWidgets/SessionItemController.h
+++ b/GUI/CommonWidgets/SessionItemController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemController.h
+//! @file GUI/CommonWidgets/SessionItemController.h
//! @brief Defines class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
#include <QObject>
#include <functional>
@@ -53,4 +53,4 @@ private:
bool m_parent_subscribed;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
diff --git a/GUI/Views/CommonWidgets/SessionItemWidget.cpp b/GUI/CommonWidgets/SessionItemWidget.cpp
similarity index 89%
rename from GUI/Views/CommonWidgets/SessionItemWidget.cpp
rename to GUI/CommonWidgets/SessionItemWidget.cpp
index d1affc641c5..2dc7bae07e2 100644
--- a/GUI/Views/CommonWidgets/SessionItemWidget.cpp
+++ b/GUI/CommonWidgets/SessionItemWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemWidget.cpp
+//! @file GUI/CommonWidgets/SessionItemWidget.cpp
//! @brief Declares class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
SessionItemWidget::SessionItemWidget(QWidget* parent)
: QWidget(parent), m_itemController(new SessionItemController(this))
diff --git a/GUI/Views/CommonWidgets/SessionItemWidget.h b/GUI/CommonWidgets/SessionItemWidget.h
similarity index 85%
rename from GUI/Views/CommonWidgets/SessionItemWidget.h
rename to GUI/CommonWidgets/SessionItemWidget.h
index 5193560b2df..10ada370658 100644
--- a/GUI/Views/CommonWidgets/SessionItemWidget.h
+++ b/GUI/CommonWidgets/SessionItemWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemWidget.h
+//! @file GUI/CommonWidgets/SessionItemWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
SessionItemController* m_itemController;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
diff --git a/GUI/Views/CommonWidgets/StatusLabel.cpp b/GUI/CommonWidgets/StatusLabel.cpp
similarity index 92%
rename from GUI/Views/CommonWidgets/StatusLabel.cpp
rename to GUI/CommonWidgets/StatusLabel.cpp
index 0e365132b16..a908dfbc152 100644
--- a/GUI/Views/CommonWidgets/StatusLabel.cpp
+++ b/GUI/CommonWidgets/StatusLabel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StatusLabel.cpp
+//! @file GUI/CommonWidgets/StatusLabel.cpp
//! @brief Implements class StatusLabel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/StatusLabel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StatusLabel.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/Views/CommonWidgets/StatusLabel.h b/GUI/CommonWidgets/StatusLabel.h
similarity index 85%
rename from GUI/Views/CommonWidgets/StatusLabel.h
rename to GUI/CommonWidgets/StatusLabel.h
index d13a01c792a..1dfa6cdc5dc 100644
--- a/GUI/Views/CommonWidgets/StatusLabel.h
+++ b/GUI/CommonWidgets/StatusLabel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StatusLabel.h
+//! @file GUI/CommonWidgets/StatusLabel.h
//! @brief Defines class StatusLabel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
#include <QFrame>
@@ -45,4 +45,4 @@ private:
QFont m_font;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
diff --git a/GUI/Views/CommonWidgets/StyleUtils.cpp b/GUI/CommonWidgets/StyleUtils.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/StyleUtils.cpp
rename to GUI/CommonWidgets/StyleUtils.cpp
index 1f8060527d6..c663c8ed026 100644
--- a/GUI/Views/CommonWidgets/StyleUtils.cpp
+++ b/GUI/CommonWidgets/StyleUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyleUtils.cpp
+//! @file GUI/CommonWidgets/StyleUtils.cpp
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/detailswidget.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/detailswidget.h"
#include "GUI/utils/hostosinfo.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/CommonWidgets/StyleUtils.h b/GUI/CommonWidgets/StyleUtils.h
similarity index 88%
rename from GUI/Views/CommonWidgets/StyleUtils.h
rename to GUI/CommonWidgets/StyleUtils.h
index f50e9fc18ff..19dbfc51fa3 100644
--- a/GUI/Views/CommonWidgets/StyleUtils.h
+++ b/GUI/CommonWidgets/StyleUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyleUtils.h
+//! @file GUI/CommonWidgets/StyleUtils.h
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEUTILS_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
#include <QFont>
#include <QString>
@@ -58,4 +58,4 @@ int PropertyPanelWidth();
} // namespace GUI::Utils::Style
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEUTILS_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
diff --git a/GUI/Views/CommonWidgets/StyledToolBar.cpp b/GUI/CommonWidgets/StyledToolBar.cpp
similarity index 93%
rename from GUI/Views/CommonWidgets/StyledToolBar.cpp
rename to GUI/CommonWidgets/StyledToolBar.cpp
index f85239b0759..2a0534136c2 100644
--- a/GUI/Views/CommonWidgets/StyledToolBar.cpp
+++ b/GUI/CommonWidgets/StyledToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyledToolBar.cpp
+//! @file GUI/CommonWidgets/StyledToolBar.cpp
//! @brief Implements class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include <QLabel>
#include <QStyle>
diff --git a/GUI/Views/CommonWidgets/StyledToolBar.h b/GUI/CommonWidgets/StyledToolBar.h
similarity index 80%
rename from GUI/Views/CommonWidgets/StyledToolBar.h
rename to GUI/CommonWidgets/StyledToolBar.h
index 69374bc093a..c18bd655338 100644
--- a/GUI/Views/CommonWidgets/StyledToolBar.h
+++ b/GUI/CommonWidgets/StyledToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyledToolBar.h
+//! @file GUI/CommonWidgets/StyledToolBar.h
//! @brief Defines class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
diff --git a/GUI/Views/CommonWidgets/UpdateTimer.cpp b/GUI/CommonWidgets/UpdateTimer.cpp
similarity index 93%
rename from GUI/Views/CommonWidgets/UpdateTimer.cpp
rename to GUI/CommonWidgets/UpdateTimer.cpp
index 4e7523ca872..993e466644c 100644
--- a/GUI/Views/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/CommonWidgets/UpdateTimer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/UpdateTimer.cpp
+//! @file GUI/CommonWidgets/UpdateTimer.cpp
//! @brief Implements class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include <QTimer>
UpdateTimer::UpdateTimer(int timerInterval, QObject* parent)
diff --git a/GUI/Views/CommonWidgets/UpdateTimer.h b/GUI/CommonWidgets/UpdateTimer.h
similarity index 85%
rename from GUI/Views/CommonWidgets/UpdateTimer.h
rename to GUI/CommonWidgets/UpdateTimer.h
index 6f76c20ac5f..3ec2c37eb76 100644
--- a/GUI/Views/CommonWidgets/UpdateTimer.h
+++ b/GUI/CommonWidgets/UpdateTimer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/UpdateTimer.h
+//! @file GUI/CommonWidgets/UpdateTimer.h
//! @brief Defines class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
#include <QObject>
@@ -49,4 +49,4 @@ private:
QTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
diff --git a/GUI/Views/CommonWidgets/detailsbutton.cpp b/GUI/CommonWidgets/detailsbutton.cpp
similarity index 99%
rename from GUI/Views/CommonWidgets/detailsbutton.cpp
rename to GUI/CommonWidgets/detailsbutton.cpp
index 4848448d876..4da5a4c7f66 100644
--- a/GUI/Views/CommonWidgets/detailsbutton.cpp
+++ b/GUI/CommonWidgets/detailsbutton.cpp
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "GUI/Views/CommonWidgets/detailsbutton.h"
+#include "GUI/CommonWidgets/detailsbutton.h"
#include "GUI/utils/hostosinfo.h"
#include <QGraphicsOpacityEffect>
diff --git a/GUI/Views/CommonWidgets/detailsbutton.h b/GUI/CommonWidgets/detailsbutton.h
similarity index 92%
rename from GUI/Views/CommonWidgets/detailsbutton.h
rename to GUI/CommonWidgets/detailsbutton.h
index df43e7c65f2..bd0a5785d38 100644
--- a/GUI/Views/CommonWidgets/detailsbutton.h
+++ b/GUI/CommonWidgets/detailsbutton.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
#include <QAbstractButton>
@@ -81,4 +81,4 @@ private:
} // namespace GUI::Utils
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
diff --git a/GUI/Views/CommonWidgets/detailswidget.cpp b/GUI/CommonWidgets/detailswidget.cpp
similarity index 99%
rename from GUI/Views/CommonWidgets/detailswidget.cpp
rename to GUI/CommonWidgets/detailswidget.cpp
index 0edab9bcd15..1400df00c5a 100644
--- a/GUI/Views/CommonWidgets/detailswidget.cpp
+++ b/GUI/CommonWidgets/detailswidget.cpp
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#include "GUI/Views/CommonWidgets/detailswidget.h"
-#include "GUI/Views/CommonWidgets/detailsbutton.h"
+#include "GUI/CommonWidgets/detailswidget.h"
+#include "GUI/CommonWidgets/detailsbutton.h"
#include "GUI/utils/hostosinfo.h"
#include <QApplication>
diff --git a/GUI/Views/CommonWidgets/detailswidget.h b/GUI/CommonWidgets/detailswidget.h
similarity index 94%
rename from GUI/Views/CommonWidgets/detailswidget.h
rename to GUI/CommonWidgets/detailswidget.h
index 59dbf118da4..c50eaaa0e78 100644
--- a/GUI/Views/CommonWidgets/detailswidget.h
+++ b/GUI/CommonWidgets/detailswidget.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
#include <QWidget>
@@ -95,4 +95,4 @@ private:
} // namespace GUI::Utils
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
diff --git a/GUI/Views/InfoWidgets/CautionSign.cpp b/GUI/InfoWidgets/CautionSign.cpp
similarity index 95%
rename from GUI/Views/InfoWidgets/CautionSign.cpp
rename to GUI/InfoWidgets/CautionSign.cpp
index 4a9999b2069..0652c1c5d93 100644
--- a/GUI/Views/InfoWidgets/CautionSign.cpp
+++ b/GUI/InfoWidgets/CautionSign.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSign.cpp
+//! @file GUI/InfoWidgets/CautionSign.cpp
//! @brief Implements class CautionSign
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/InfoWidgets/CautionSignWidget.h"
+#include "GUI/InfoWidgets/CautionSignWidget.h"
#include <QAbstractScrollArea>
#include <QEvent>
#include <QScrollBar>
diff --git a/GUI/Views/InfoWidgets/CautionSign.h b/GUI/InfoWidgets/CautionSign.h
similarity index 85%
rename from GUI/Views/InfoWidgets/CautionSign.h
rename to GUI/InfoWidgets/CautionSign.h
index 5b73be31729..77ffe176d5c 100644
--- a/GUI/Views/InfoWidgets/CautionSign.h
+++ b/GUI/InfoWidgets/CautionSign.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSign.h
+//! @file GUI/InfoWidgets/CautionSign.h
//! @brief Defines class CautionSign
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGN_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGN_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
+#define BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
#include <QObject>
@@ -50,4 +50,4 @@ private:
bool m_clear_just_had_happened;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGN_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
diff --git a/GUI/Views/InfoWidgets/CautionSignWidget.cpp b/GUI/InfoWidgets/CautionSignWidget.cpp
similarity index 93%
rename from GUI/Views/InfoWidgets/CautionSignWidget.cpp
rename to GUI/InfoWidgets/CautionSignWidget.cpp
index fdd9db1f746..6b071e9e23b 100644
--- a/GUI/Views/InfoWidgets/CautionSignWidget.cpp
+++ b/GUI/InfoWidgets/CautionSignWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSignWidget.cpp
+//! @file GUI/InfoWidgets/CautionSignWidget.cpp
//! @brief Implements class CautionSignWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/CautionSignWidget.h"
+#include "GUI/InfoWidgets/CautionSignWidget.h"
#include <QMessageBox>
#include <QPainter>
#include <QRect>
diff --git a/GUI/Views/InfoWidgets/CautionSignWidget.h b/GUI/InfoWidgets/CautionSignWidget.h
similarity index 83%
rename from GUI/Views/InfoWidgets/CautionSignWidget.h
rename to GUI/InfoWidgets/CautionSignWidget.h
index 11041d17fa5..450f52b633e 100644
--- a/GUI/Views/InfoWidgets/CautionSignWidget.h
+++ b/GUI/InfoWidgets/CautionSignWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSignWidget.h
+//! @file GUI/InfoWidgets/CautionSignWidget.h
//! @brief Defines class CautionSignWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGNWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#define BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
#include <QPixmap>
#include <QString>
@@ -40,4 +40,4 @@ private:
QString m_caution_message;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
diff --git a/GUI/Views/InfoWidgets/ComboSelectorDialog.cpp b/GUI/InfoWidgets/ComboSelectorDialog.cpp
similarity index 96%
rename from GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
rename to GUI/InfoWidgets/ComboSelectorDialog.cpp
index 0716a946394..5635e657180 100644
--- a/GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
+++ b/GUI/InfoWidgets/ComboSelectorDialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
+//! @file GUI/InfoWidgets/ComboSelectorDialog.cpp
//! @brief Implements class ComboSelectorDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/ComboSelectorDialog.h"
+#include "GUI/InfoWidgets/ComboSelectorDialog.h"
#include <QApplication>
#include <QComboBox>
#include <QLabel>
diff --git a/GUI/Views/InfoWidgets/ComboSelectorDialog.h b/GUI/InfoWidgets/ComboSelectorDialog.h
similarity index 83%
rename from GUI/Views/InfoWidgets/ComboSelectorDialog.h
rename to GUI/InfoWidgets/ComboSelectorDialog.h
index c3a6d15abce..6412cee1875 100644
--- a/GUI/Views/InfoWidgets/ComboSelectorDialog.h
+++ b/GUI/InfoWidgets/ComboSelectorDialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ComboSelectorDialog.h
+//! @file GUI/InfoWidgets/ComboSelectorDialog.h
//! @brief Defines class ComboSelectorDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#define BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
#include <QDialog>
#include <QString>
@@ -45,4 +45,4 @@ private:
QLabel* m_bottomLabel;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
diff --git a/GUI/Views/InfoWidgets/DetailedMessageBox.cpp b/GUI/InfoWidgets/DetailedMessageBox.cpp
similarity index 96%
rename from GUI/Views/InfoWidgets/DetailedMessageBox.cpp
rename to GUI/InfoWidgets/DetailedMessageBox.cpp
index 03a75b01f4a..57b8d7997db 100644
--- a/GUI/Views/InfoWidgets/DetailedMessageBox.cpp
+++ b/GUI/InfoWidgets/DetailedMessageBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/DetailedMessageBox.cpp
+//! @file GUI/InfoWidgets/DetailedMessageBox.cpp
//! @brief Implements class DetailedMessageBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/InfoWidgets/DetailedMessageBox.h"
#include <QApplication>
#include <QLabel>
#include <QMessageBox>
diff --git a/GUI/Views/InfoWidgets/DetailedMessageBox.h b/GUI/InfoWidgets/DetailedMessageBox.h
similarity index 84%
rename from GUI/Views/InfoWidgets/DetailedMessageBox.h
rename to GUI/InfoWidgets/DetailedMessageBox.h
index 7a727be76cd..8088fdaded5 100644
--- a/GUI/Views/InfoWidgets/DetailedMessageBox.h
+++ b/GUI/InfoWidgets/DetailedMessageBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/DetailedMessageBox.h
+//! @file GUI/InfoWidgets/DetailedMessageBox.h
//! @brief Defines class DetailedMessageBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#define BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
#include <QDialog>
#include <QString>
@@ -43,4 +43,4 @@ private:
QTextEdit* m_textEdit;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
diff --git a/GUI/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/InfoWidgets/OverlayLabelController.cpp
similarity index 91%
rename from GUI/Views/InfoWidgets/OverlayLabelController.cpp
rename to GUI/InfoWidgets/OverlayLabelController.cpp
index 834ccccabd0..7d2561c360e 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/InfoWidgets/OverlayLabelController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelController.cpp
+//! @file GUI/InfoWidgets/OverlayLabelController.cpp
//! @brief Implements class OverlayLabelController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/OverlayLabelController.h"
+#include "GUI/InfoWidgets/OverlayLabelController.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/InfoWidgets/OverlayLabelWidget.h"
+#include "GUI/InfoWidgets/OverlayLabelWidget.h"
#include <QAbstractScrollArea>
#include <QEvent>
#include <QRect>
diff --git a/GUI/Views/InfoWidgets/OverlayLabelController.h b/GUI/InfoWidgets/OverlayLabelController.h
similarity index 82%
rename from GUI/Views/InfoWidgets/OverlayLabelController.h
rename to GUI/InfoWidgets/OverlayLabelController.h
index effc2871c19..d4666b60fa4 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelController.h
+++ b/GUI/InfoWidgets/OverlayLabelController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelController.h
+//! @file GUI/InfoWidgets/OverlayLabelController.h
//! @brief Defines class OverlayLabelController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#define BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
#include <QObject>
#include <QString>
@@ -46,4 +46,4 @@ private:
QString m_text;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
diff --git a/GUI/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/InfoWidgets/OverlayLabelWidget.cpp
similarity index 87%
rename from GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
rename to GUI/InfoWidgets/OverlayLabelWidget.cpp
index 8ae83b8bb3b..5c68537ed6c 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/InfoWidgets/OverlayLabelWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
+//! @file GUI/InfoWidgets/OverlayLabelWidget.cpp
//! @brief Implements class OverlayLabelWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/OverlayLabelWidget.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/InfoWidgets/OverlayLabelWidget.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/InfoWidgets/OverlayLabelWidget.h
similarity index 82%
rename from GUI/Views/InfoWidgets/OverlayLabelWidget.h
rename to GUI/InfoWidgets/OverlayLabelWidget.h
index 587fe950414..160e333969c 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/InfoWidgets/OverlayLabelWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelWidget.h
+//! @file GUI/InfoWidgets/OverlayLabelWidget.h
//! @brief Defines class OverlayLabelWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#define BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
#include <QRect>
#include <QString>
@@ -40,4 +40,4 @@ private:
QRect m_bounding_rect;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
diff --git a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp b/GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
similarity index 96%
rename from GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp
rename to GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
index fbfbb1997c6..51bc90204d4 100644
--- a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp
+++ b/GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp
+//! @file GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
//! @brief Implements class ProjectLoadProblemDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/utils/Helpers.h"
#include <QBoxLayout>
#include <QGridLayout>
diff --git a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h b/GUI/InfoWidgets/ProjectLoadProblemDialog.h
similarity index 80%
rename from GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h
rename to GUI/InfoWidgets/ProjectLoadProblemDialog.h
index a9bb1b87424..e8131bc636e 100644
--- a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h
+++ b/GUI/InfoWidgets/ProjectLoadProblemDialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h
+//! @file GUI/InfoWidgets/ProjectLoadProblemDialog.h
//! @brief Defines class ProjectLoadProblemDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#define BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
#include <QDialog>
#include <QString>
@@ -34,4 +34,4 @@ private:
QString m_projectDocumentVersion;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
diff --git a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp b/GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
similarity index 98%
rename from GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
rename to GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
index ae82d0938c0..6f871a4b0e0 100644
--- a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+++ b/GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+//! @file GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
//! @brief Defines class PythonSyntaxHighlighter
//!
//! @homepage http://www.bornagainproject.org
@@ -35,7 +35,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
PythonSyntaxHighlighter::PythonSyntaxHighlighter(QTextDocument* parent) : QSyntaxHighlighter(parent)
{
diff --git a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/InfoWidgets/PythonSyntaxHighlighter.h
similarity index 92%
rename from GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
rename to GUI/InfoWidgets/PythonSyntaxHighlighter.h
index 17c44f5459c..18c2fee7761 100644
--- a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/InfoWidgets/PythonSyntaxHighlighter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
+//! @file GUI/InfoWidgets/PythonSyntaxHighlighter.h
//! @brief Defines class PythonSyntaxHighlighter
//!
//! @homepage http://www.bornagainproject.org
@@ -35,8 +35,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#define BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
#include <QSyntaxHighlighter>
@@ -86,4 +86,4 @@ private:
QRegExp triDoubleQuote;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
diff --git a/GUI/Models/RealDataItem.cpp b/GUI/Models/RealDataItem.cpp
index f3c984fbeba..a8db7216632 100644
--- a/GUI/Models/RealDataItem.cpp
+++ b/GUI/Models/RealDataItem.cpp
@@ -30,7 +30,7 @@
#include "GUI/Models/ProjectionItems.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/SpecularDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/DeserializationException.h"
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/SampleListModel.cpp b/GUI/Models/SampleListModel.cpp
index a1f048a4f3d..d341c149702 100644
--- a/GUI/Models/SampleListModel.cpp
+++ b/GUI/Models/SampleListModel.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/ModelUtils.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFontMetrics>
#include <QIcon>
diff --git a/GUI/mainwindow/ProjectUtils.cpp b/GUI/Project/ProjectUtils.cpp
similarity index 91%
rename from GUI/mainwindow/ProjectUtils.cpp
rename to GUI/Project/ProjectUtils.cpp
index 06e7d9ae2db..b57f1c80d00 100644
--- a/GUI/mainwindow/ProjectUtils.cpp
+++ b/GUI/Project/ProjectUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/ProjectUtils.cpp
+//! @file GUI/Project/ProjectUtils.cpp
//! @brief Implements ProjectUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include <QFileInfo>
QString GUI::Project::Utils::projectName(const QString& projectFileName)
diff --git a/GUI/mainwindow/ProjectUtils.h b/GUI/Project/ProjectUtils.h
similarity index 89%
rename from GUI/mainwindow/ProjectUtils.h
rename to GUI/Project/ProjectUtils.h
index 41fff8d50c6..1ce08899ccc 100644
--- a/GUI/mainwindow/ProjectUtils.h
+++ b/GUI/Project/ProjectUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/ProjectUtils.h
+//! @file GUI/Project/ProjectUtils.h
//! @brief Defines namespace GUI::Project::Utils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTUTILS_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTUTILS_H
+#ifndef BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
+#define BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
#include <QString>
@@ -44,4 +44,4 @@ bool hasAutosavedData(const QString& projectFileName);
} // namespace GUI::Project::Utils
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTUTILS_H
+#endif // BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
diff --git a/GUI/mainwindow/projectdocument.cpp b/GUI/Project/projectdocument.cpp
similarity index 98%
rename from GUI/mainwindow/projectdocument.cpp
rename to GUI/Project/projectdocument.cpp
index fe4860d4371..79029dc0704 100644
--- a/GUI/mainwindow/projectdocument.cpp
+++ b/GUI/Project/projectdocument.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectdocument.cpp
+//! @file GUI/Project/projectdocument.cpp
//! @brief Implements class ProjectDocument
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Models/DocumentModel.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/JobModel.h"
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/MessageService.h"
#include <QDir>
diff --git a/GUI/mainwindow/projectdocument.h b/GUI/Project/projectdocument.h
similarity index 95%
rename from GUI/mainwindow/projectdocument.h
rename to GUI/Project/projectdocument.h
index 49f166ac02e..05ed252405a 100644
--- a/GUI/mainwindow/projectdocument.h
+++ b/GUI/Project/projectdocument.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectdocument.h
+//! @file GUI/Project/projectdocument.h
//! @brief Defines class ProjectDocument
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTDOCUMENT_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTDOCUMENT_H
+#ifndef BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
+#define BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
#include "GUI/Models/ApplicationModels.h"
#include "GUI/mainwindow/LinkInstrumentManager.h"
@@ -140,4 +140,4 @@ inline ProjectDocument::Functionalities toFunctionalities(const QVariant& v)
v.value<ProjectDocument::Functionalities::Int>());
}
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTDOCUMENT_H
+#endif // BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/Project/projectmanager.cpp
similarity index 97%
rename from GUI/mainwindow/projectmanager.cpp
rename to GUI/Project/projectmanager.cpp
index e65daa72829..0f564ee19f0 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/Project/projectmanager.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectmanager.cpp
+//! @file GUI/Project/projectmanager.cpp
//! @brief Implements class ProjectManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,19 +12,19 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "Base/Utils/Assert.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/Error.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
+#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/mainwindow/newprojectdialog.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/MessageService.h"
#include <QApplication>
#include <QDateTime>
diff --git a/GUI/mainwindow/projectmanager.h b/GUI/Project/projectmanager.h
similarity index 92%
rename from GUI/mainwindow/projectmanager.h
rename to GUI/Project/projectmanager.h
index df39b430e17..5d05aa36ae1 100644
--- a/GUI/mainwindow/projectmanager.h
+++ b/GUI/Project/projectmanager.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectmanager.h
+//! @file GUI/Project/projectmanager.h
//! @brief Defines class ProjectManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QObject>
#include <QStringList>
@@ -103,4 +103,4 @@ private:
static ProjectManager* s_instance;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
diff --git a/GUI/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
index e79d7cf68a6..e5a7b12ac4f 100644
--- a/GUI/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/Views/FitWidgets/FitActivityPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/FitWidgets/FitSessionWidget.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 5bf4bb4d792..605c21138d5 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -22,9 +22,9 @@
#include "GUI/Models/JobModel.h"
#include "GUI/Models/ParameterTreeItems.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/Views/InfoWidgets/OverlayLabelController.h"
+#include "GUI/InfoWidgets/OverlayLabelController.h"
#include "GUI/Views/SessionModelDelegate.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.h b/GUI/Views/FitWidgets/FitParameterWidget.h
index da374b6d6ce..41f9480dd9c 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/Views/FitWidgets/FitParameterWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class JobItem;
diff --git a/GUI/Views/FitWidgets/FitSessionWidget.cpp b/GUI/Views/FitWidgets/FitSessionWidget.cpp
index ac922933336..34ba0eff562 100644
--- a/GUI/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/Views/FitWidgets/FitSessionWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/FitWidgets/FitSessionController.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/JobRealTimeToolBar.h b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
index 14c93f65caa..792f1519a98 100644
--- a/GUI/Views/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
class QToolButton;
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
index 4235ff801c1..e1d8dac28b8 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.h b/GUI/Views/FitWidgets/JobRealTimeWidget.h
index f36478aac67..d405015bb5e 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.h
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
-#include "GUI/Views/CommonWidgets/ItemStackPresenter.h"
+#include "GUI/CommonWidgets/ItemStackPresenter.h"
class JobModel;
class JobItem;
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index 4d9525f612f..4bda538e259 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/ParameterTuningModel.h"
#include "GUI/Models/SessionItemUtils.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QHBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index e3eedde0fe9..38dcf05deef 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -22,7 +22,7 @@
#include "GUI/Views/FitWidgets/JobRealTimeToolBar.h"
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
#include "GUI/Views/FitWidgets/SliderSettingsWidget.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.h b/GUI/Views/FitWidgets/ParameterTuningWidget.h
index a5b8234a0be..1392228c9b4 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.h
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class JobRealTimeToolBar;
class JobModel;
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 7c2429acbf6..18df163cf8e 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -15,9 +15,9 @@
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
#include "GUI/Models/FitSuiteItem.h"
#include "GUI/Models/JobItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.h b/GUI/Views/FitWidgets/RunFitControlWidget.h
index f1b6374d313..a3b7c011ef3 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QWidget>
class JobItem;
diff --git a/GUI/Views/ImportDataView.cpp b/GUI/Views/ImportDataView.cpp
index 7fe10743884..7ee2e94b6f7 100644
--- a/GUI/Views/ImportDataView.cpp
+++ b/GUI/Views/ImportDataView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QAction>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataView.h b/GUI/Views/ImportDataView.h
index 4f1b362aa2f..9957e155fe2 100644
--- a/GUI/Views/ImportDataView.h
+++ b/GUI/Views/ImportDataView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
-#include "GUI/Views/CommonWidgets/ItemStackPresenter.h"
+#include "GUI/CommonWidgets/ItemStackPresenter.h"
#include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
class RealDataModel;
diff --git a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
index 8e222741449..1f3444fad40 100644
--- a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class SessionItem;
class MaskEditor;
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.h b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
index bed67de9405..0c800efdf78 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
-#include "GUI/Views/CommonWidgets/ItemComboWidget.h"
+#include "GUI/CommonWidgets/ItemComboWidget.h"
class RealDataMaskWidget;
class QAction;
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index a4cbedb1ed9..49b74f4656f 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/InstrumentModel.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QComboBox>
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 01166ac0681..cda0f00d08c 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -20,15 +20,15 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFileDialog>
#include <QItemSelectionModel>
diff --git a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index dda604feea5..9352291792c 100644
--- a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
#include "GUI/Models/BeamWavelengthItem.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Views/InstrumentWidgets/InclinationAnglesEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index 64c041b28ea..0af6e15f489 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
#include "GUI/Models/DistributionItems.h"
#include "GUI/Models/ItemWithDistribution.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include <QDoubleSpinBox>
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 9036dc2d4f3..27c752b30d4 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
#include "GUI/Models/DistributionItems.h"
#include "GUI/Models/RealLimitsItems.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "Param/Distrib/Distributions.h"
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
index fef9c761b63..2a2192f8186 100644
--- a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/GISASBeamEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index ec6af1bad87..6dcbae33982 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index e9c64295323..f70d2e57369 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QAction>
#include <QListView>
#include <QMessageBox>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index ece40599aa1..20cce9454e7 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -15,10 +15,10 @@
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
#include "GUI/Models/InstrumentItems.h"
#include "GUI/Models/InstrumentModel.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QBoxLayout>
InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
diff --git a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
index c7e5728061e..097bba77ca4 100644
--- a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
index 555e5fb0cdb..a78ffe05bb1 100644
--- a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/Views/InstrumentWidgets/SpecularBeamEditor.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index 2ee34c69245..b06de0e4a59 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Models/AxesItems.h"
#include "GUI/Models/IntensityDataItem.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
index 6ad6eb21233..dc461241ddb 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class ColorMap;
class FontScalingEvent;
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 7a325389bfb..49660c8cb6b 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/IntensityDataItem.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index beda226f989..c49056c7c1d 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -16,12 +16,12 @@
#include "GUI/Models/ComboProperty.h"
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/RealDataItem.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
index 0eb3fcde882..e8df4d64b7b 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
#include "Device/Data/OutputData.h"
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index 2473ba731a8..d3ef3b7e227 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index 8c3a008a509..170fd81f11a 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class IntensityDataItem;
class ComponentEditor;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
index ff518635df3..35ebfaa1d62 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
index 21906401642..d664abc3e0e 100644
--- a/GUI/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/DataItem.h"
#include "GUI/Models/DataProperties.h"
#include "GUI/Models/DataPropertyContainer.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
index 6c9ec51e971..4c11273bfaf 100644
--- a/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
+++ b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
-#include "GUI/Views/CommonWidgets/StatusLabel.h"
+#include "GUI/CommonWidgets/StatusLabel.h"
#include <QList>
class ScientificPlot;
diff --git a/GUI/Views/IntensityDataWidgets/ScientificPlot.h b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
index 960ec2fb45e..fc13e6d3f71 100644
--- a/GUI/Views/IntensityDataWidgets/ScientificPlot.h
+++ b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class PlotEventInfo;
diff --git a/GUI/Views/IntensityDataWidgets/plot_constants.h b/GUI/Views/IntensityDataWidgets/plot_constants.h
index a7bae1451d7..2efeb7ba0fa 100644
--- a/GUI/Views/IntensityDataWidgets/plot_constants.h
+++ b/GUI/Views/IntensityDataWidgets/plot_constants.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT_CONSTANTS_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT_CONSTANTS_H
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QSize>
namespace GUI::Constants {
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget.h b/GUI/Views/JobWidgets/FitComparisonWidget.h
index 51fbcd2c5eb..d63d9386134 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget.h
+++ b/GUI/Views/JobWidgets/FitComparisonWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QMap>
class JobItem;
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget1D.h b/GUI/Views/JobWidgets/FitComparisonWidget1D.h
index ea853cf3fea..a979cb85f16 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget1D.h
+++ b/GUI/Views/JobWidgets/FitComparisonWidget1D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class Data1DViewItem;
class FitComparison1DViewController;
diff --git a/GUI/Views/JobWidgets/FitFlowWidget.h b/GUI/Views/JobWidgets/FitFlowWidget.h
index d3f18724bba..a8e7e0b5efa 100644
--- a/GUI/Views/JobWidgets/FitFlowWidget.h
+++ b/GUI/Views/JobWidgets/FitFlowWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class HistogramPlot;
class FitSuiteItem;
diff --git a/GUI/Views/JobWidgets/JobListView.cpp b/GUI/Views/JobWidgets/JobListView.cpp
index a830bc9aed5..9c5ce8281a8 100644
--- a/GUI/Views/JobWidgets/JobListView.cpp
+++ b/GUI/Views/JobWidgets/JobListView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/JobWidgets/JobListModel.h"
#include "GUI/Views/JobWidgets/JobListViewDelegate.h"
#include <QAction>
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.cpp b/GUI/Views/JobWidgets/JobMessagePanel.cpp
index 4e55543413a..8282b14d74e 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/Views/JobWidgets/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.h b/GUI/Views/JobWidgets/JobMessagePanel.h
index 0cbf4f7979b..06c81dfdd5e 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/Views/JobWidgets/JobMessagePanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
-#include "GUI/Views/CommonWidgets/InfoPanel.h"
+#include "GUI/CommonWidgets/InfoPanel.h"
#include "GUI/Views/FitWidgets/FitLog.h"
#include <QColor>
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 00552914d67..4865fb52f3e 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
#include "GUI/Models/JobItem.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/JobWidgets/JobPropertiesTableModel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobResultsPresenter.h b/GUI/Views/JobWidgets/JobResultsPresenter.h
index 7ebb7e26c07..d2b53dca40d 100644
--- a/GUI/Views/JobWidgets/JobResultsPresenter.h
+++ b/GUI/Views/JobWidgets/JobResultsPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
-#include "GUI/Views/CommonWidgets/ItemComboWidget.h"
+#include "GUI/CommonWidgets/ItemComboWidget.h"
class InstrumentItem;
class JobItem;
diff --git a/GUI/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
index 7cb96115996..9b6e661d006 100644
--- a/GUI/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Views/JobWidgets/JobListView.h"
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 7bcf6d3d535..feaf8b3f846 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
-#include "GUI/Views/CommonWidgets/DocksController.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Views/FitWidgets/FitActivityPanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
@@ -24,7 +24,7 @@
#include "GUI/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QMenu>
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/Views/JobWidgets/JobViewActivities.cpp b/GUI/Views/JobWidgets/JobViewActivities.cpp
index a2d9ff1a5ea..8483057ce4a 100644
--- a/GUI/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/Views/JobWidgets/JobViewActivities.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
namespace {
QMap<JobViewActivity, QVector<JobViewFlags::Dock>> createActivityMap()
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index 3cc43f9fa4e..f2e6c56baf9 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -21,7 +21,7 @@
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
diff --git a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
index 495ae418138..d7295fa05e7 100644
--- a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/MaskWidgets/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
#include "GUI/Views/MaskWidgets/MaskEditorActions.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 602312b0c0f..48e36a4546f 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -20,12 +20,12 @@
#include "GUI/Models/MaterialModelStore.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/VectorItem.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "ui_MaterialEditorDialog.h"
#include <QAction>
diff --git a/GUI/Views/ProjectSettingsView.cpp b/GUI/Views/ProjectSettingsView.cpp
index 85117f3164b..d3af86238a2 100644
--- a/GUI/Views/ProjectSettingsView.cpp
+++ b/GUI/Views/ProjectSettingsView.cpp
@@ -17,8 +17,8 @@
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/InstrumentModel.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/qstringutils.h"
#include "ui_ProjectSettingsView.h"
#include <QDir>
diff --git a/GUI/Views/ProjectSettingsView.h b/GUI/Views/ProjectSettingsView.h
index 4b37ad409ff..8c961e8c603 100644
--- a/GUI/Views/ProjectSettingsView.h
+++ b/GUI/Views/ProjectSettingsView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
#define BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QWidget>
namespace Ui {
diff --git a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
index 6ca8bf83f2f..e79459afadc 100644
--- a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class ProjectionsEditor;
class IntensityDataItem;
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
index b1e851f061a..cf5b08855d1 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QMap>
#include <memory>
#include <qcustomplot.h>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h b/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
index f8c51cb8235..0b9bf88e658 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class ComponentEditor;
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
index ffaffc2605f..2fc05896cdf 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/ProjectionsWidgets/ProjectionsToolBar.h"
#include "GUI/Views/ProjectionsWidgets/ProjectionsEditorActions.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
index a36b7d365b7..fb5f3eb0a6a 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include "GUI/Views/MaskWidgets/MaskEditorFlags.h"
class ProjectionsPlot;
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 4145e06a4d5..78cf5ef83fd 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -21,8 +21,8 @@
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/MaskItems.h"
#include "GUI/Models/ProjectionItems.h"
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectmanager.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index c6cd25201b8..0ea79158fd3 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
#include "GUI/Models/ComponentProxyModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
#include "GUI/Views/SessionModelDelegate.h"
#include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index b01868a95a5..d78ad38d8e2 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -17,9 +17,9 @@
#include "Fit/Param/RealLimits.h"
#include "GUI/Models/ComboProperty.h"
#include "GUI/Models/MaterialItemUtils.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index 47ba56a3dac..85d0b7d35a9 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Models/SessionFlags.h"
#include "GUI/Models/SessionItem.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include <QLabel>
#include <QLineEdit>
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index fa27c5902ba..eb3a9ba935e 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/VectorItem.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/Views/SessionModelDelegate.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index a2a0c5c9104..cd8007369ac 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -17,11 +17,11 @@
#include "GUI/Models/FilterPropertyProxy.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SessionItemUtils.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
index 95248c40ffb..c5f461e853b 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QCheckBox>
#include <QToolButton>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
index 5366c375679..a232f4202d0 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
class QToolButton;
class QCheckBox;
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 641ab5fb482..287b09dd239 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/ConnectableView.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionGraphicsItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include <QObject>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
index f2fd444a90c..fc2ef648f7c 100644
--- a/GUI/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include <QDrag>
#include <QPixmap>
#include <QWidget>
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index ddfaf561062..fe838d06f32 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -24,7 +24,7 @@
#include "GUI/Models/ParticleLayoutItem.h"
#include "GUI/Models/RotationItems.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
@@ -32,7 +32,7 @@
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/Views/SampleDesigner/SampleViewFactory.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/FormLayouter.cpp b/GUI/Views/SampleDesigner/FormLayouter.cpp
index d133622c043..dfb47c91229 100644
--- a/GUI/Views/SampleDesigner/FormLayouter.cpp
+++ b/GUI/Views/SampleDesigner/FormLayouter.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Models/UIntDescriptor.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index f8ce66c4fc3..2e967f232f8 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/Views/SampleDesigner/InterferenceForm.cpp b/GUI/Views/SampleDesigner/InterferenceForm.cpp
index d02937d01c3..b930727d140 100644
--- a/GUI/Views/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Models/InterferenceItems.h"
#include "GUI/Models/ParticleLayoutItem.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
diff --git a/GUI/Views/SampleDesigner/InterferenceViews.cpp b/GUI/Views/SampleDesigner/InterferenceViews.cpp
index 2e8bcade65a..3de6f266d77 100644
--- a/GUI/Views/SampleDesigner/InterferenceViews.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceViews.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/InterferenceViews.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
Interference1DLatticeView::Interference1DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
index fa05c9cd117..950da909332 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
@@ -23,7 +23,7 @@
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/RotationItems.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
diff --git a/GUI/Views/SampleDesigner/LayerForm.cpp b/GUI/Views/SampleDesigner/LayerForm.cpp
index cb77b856d3f..4dc6d3488c6 100644
--- a/GUI/Views/SampleDesigner/LayerForm.cpp
+++ b/GUI/Views/SampleDesigner/LayerForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/UIntDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
index 9116a39a3c0..45e5107398f 100644
--- a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/MultiLayerItem.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index 4132263c9e8..c87c3ab23e7 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Models/LayerItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index de56b8d6b17..8b6f6a63add 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -20,12 +20,12 @@
#include "GUI/Models/MaterialModelStore.h"
#include "GUI/Models/ModelPath.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleLineEdit.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/DoubleLineEdit.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/LayoutUtils.h"
#include <QGridLayout>
diff --git a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
index fff3322efe7..f792ec50e22 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/MesoCrystalItem.h"
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
index 11e0d2dae63..ee9d801a7a6 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/MesoCrystalView.h"
#include "GUI/Models/MesoCrystalItem.h"
#include "GUI/Models/ParticleItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/MultiLayerForm.cpp b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
index 6015cab1a1f..db8abcd8f83 100644
--- a/GUI/Views/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index 1a190973914..f37643ded94 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SessionGraphicsItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
diff --git a/GUI/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
index 6640777c2da..856e2bb6896 100644
--- a/GUI/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/NodeEditorPort.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include <QGraphicsScene>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
index 70088b9d984..a13d2b37716 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Models/ParticleCompositionItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
index 1ac5bb8bd45..6347749ec60 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SampleDesigner/ParticleCompositionView.h"
#include "GUI/Models/ParticleItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index 36f99ff3ebc..348ba31f5c6 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/ParticleCoreShellItem.h"
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
#include "GUI/utils/ActionFactory.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
index 8e6e4cfae16..64bad7bed29 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SampleDesigner/ParticleCoreShellView.h"
#include "GUI/Models/ParticleCoreShellItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleForm.cpp b/GUI/Views/SampleDesigner/ParticleForm.cpp
index 3811f69a89d..d6a3b399f74 100644
--- a/GUI/Views/SampleDesigner/ParticleForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/FormFactorItems.h"
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp b/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
index e048bf5c978..0b59ad6de39 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/Models/ItemWithParticles.h"
#include "GUI/Models/ParticleLayoutItem.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index 48a1429948e..de9346b01d6 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/ParticleView.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index eaba862c6cf..c1b8d9478b3 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -17,8 +17,8 @@
#include "GUI/Models/FormFactorItems.h"
#include "GUI/Models/GroupItem.h"
#include "GUI/Models/ParticleItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleEditorController.cpp b/GUI/Views/SampleDesigner/SampleEditorController.cpp
index 34e018fa675..f5c9a60d8e9 100644
--- a/GUI/Views/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/Views/SampleDesigner/SampleEditorController.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/ParticleLayoutItem.h"
#include "GUI/Models/UIntDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index d7f41c3db82..8a7957a21d3 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/GUIExamplesFactory.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleListModel.h"
-#include "GUI/Views/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.cpp b/GUI/Views/SampleDesigner/SampleToolBar.cpp
index b5f706405da..52a18cb4a1e 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBar.cpp
@@ -16,7 +16,7 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QAction>
#include <QButtonGroup>
#include <QComboBox>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.h b/GUI/Views/SampleDesigner/SampleToolBar.h
index 456b56e75ab..e5df4beea03 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/Views/SampleDesigner/SampleToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include <QTreeView>
class QAction;
diff --git a/GUI/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
index 66db00d47e5..48c7592165c 100644
--- a/GUI/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/IView.h"
#include <QModelIndex>
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
index bae2dbb4a3c..1ece6448628 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/Views/SampleDesigner/ScriptPanel.cpp
@@ -17,10 +17,10 @@
#include "GUI/Models/DomainObjectBuilder.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
-#include "GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "Sample/Multilayer/MultiLayer.h"
#include <QScrollBar>
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.h b/GUI/Views/SampleDesigner/ScriptPanel.h
index a7273eb5d57..6406b06eded 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.h
+++ b/GUI/Views/SampleDesigner/ScriptPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
-#include "GUI/Views/CommonWidgets/InfoPanel.h"
+#include "GUI/CommonWidgets/InfoPanel.h"
class SampleModel;
class PythonSyntaxHighlighter;
diff --git a/GUI/Views/SampleDesigner/TransformationView.cpp b/GUI/Views/SampleDesigner/TransformationView.cpp
index ae78e585e1a..17481742a59 100644
--- a/GUI/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/Views/SampleDesigner/TransformationView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/TransformationView.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
TransformationView::TransformationView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleView.cpp b/GUI/Views/SampleView.cpp
index bbd664f18bb..9c6982da540 100644
--- a/GUI/Views/SampleView.cpp
+++ b/GUI/Views/SampleView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/FilterPropertyProxy.h"
#include "GUI/Models/MultiLayerItem.h"
-#include "GUI/Views/CommonWidgets/DocksController.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
@@ -28,7 +28,7 @@
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QBoxLayout>
#include <QDockWidget>
diff --git a/GUI/Views/SessionModelView.cpp b/GUI/Views/SessionModelView.cpp
index c6cc343c9ae..05c39682d3f 100644
--- a/GUI/Views/SessionModelView.cpp
+++ b/GUI/Views/SessionModelView.cpp
@@ -18,12 +18,12 @@
#include "GUI/Models/MaterialModel.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/ModelTreeView.h"
+#include "GUI/CommonWidgets/ModelTreeView.h"
#include "GUI/Views/SessionModelDelegate.h"
#include "GUI/Views/TestView.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/SimulationView.cpp b/GUI/Views/SimulationView.cpp
index ef03952f54f..e3958e7306b 100644
--- a/GUI/Views/SimulationView.cpp
+++ b/GUI/Views/SimulationView.cpp
@@ -26,11 +26,11 @@
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SampleValidator.h"
#include "GUI/Models/SimulationOptionsItem.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include "ui_SimulationView.h"
#include <QButtonGroup>
#include <QMessageBox>
diff --git a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
index d167cc9919b..73eace35a1a 100644
--- a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -17,11 +17,11 @@
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/DomainSimulationBuilder.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
-#include "GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
index b5dddacf649..6f9f784c5b8 100644
--- a/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index 6fef3db395e..d9d0ebc7a59 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/SpecularDataItem.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <qcustomplot.h>
SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
index 78be99e8bcf..4c28ecb976e 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QWidget>
class SpecularDataItem;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
index fd1074638be..65bd082073d 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#include "GUI/Models/AbstractDataLoader1D.h"
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include "qcustomplot.h"
#include <memory>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
index 580c34374e6..639649217c6 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class SpecularDataCanvas;
class SpecularDataItem;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
index 3b09620a049..a786b267fdb 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SpecularDataWidgets/SpecularPlot.h"
#include "GUI/Models/AxesItems.h"
#include "GUI/Models/SpecularDataItem.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
index 8b1c36ec877..f17b0c8ec4a 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Views/WelcomeView.cpp b/GUI/Views/WelcomeView.cpp
index 3ad7f0b51a8..5c336c57ecf 100644
--- a/GUI/Views/WelcomeView.cpp
+++ b/GUI/Views/WelcomeView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/WelcomeView.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/LayoutUtils.h"
#include "GUI/utils/qstringutils.h"
#include "ui_WelcomeView.h"
diff --git a/GUI/mainwindow/AutosaveController.cpp b/GUI/mainwindow/AutosaveController.cpp
index 35af4fdce3a..e5ac7e6c247 100644
--- a/GUI/mainwindow/AutosaveController.cpp
+++ b/GUI/mainwindow/AutosaveController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include <QDir>
namespace {
diff --git a/GUI/mainwindow/OutputDataIOService.cpp b/GUI/mainwindow/OutputDataIOService.cpp
index 13d21bbe8b0..a71f310a49c 100644
--- a/GUI/mainwindow/OutputDataIOService.cpp
+++ b/GUI/mainwindow/OutputDataIOService.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Models/ModelPath.h"
#include "GUI/Models/SaveLoadInterface.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/MessageService.h"
#include <QFile>
#include <QSet>
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index 5eeb1b34d5a..a773952d8f2 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -21,12 +21,12 @@
#include "GUI/Application/Application.h"
#include "GUI/Models/GUIDomainSampleVisitor.h"
#include "GUI/Models/GUIObjectBuilder.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/InfoWidgets/ComboSelectorDialog.h"
-#include "GUI/Views/InfoWidgets/DetailedMessageBox.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/InfoWidgets/ComboSelectorDialog.h"
+#include "GUI/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/mainwindow/SaveService.cpp
index f883e2f57a6..2544ece2b95 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/mainwindow/SaveService.cpp
@@ -16,9 +16,9 @@
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/SaveThread.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QApplication>
#include <QCoreApplication>
#include <QTime>
diff --git a/GUI/mainwindow/SaveThread.cpp b/GUI/mainwindow/SaveThread.cpp
index af3d2c8043d..b99ea795f2f 100644
--- a/GUI/mainwindow/SaveThread.cpp
+++ b/GUI/mainwindow/SaveThread.cpp
@@ -14,7 +14,7 @@
#include "GUI/mainwindow/SaveThread.h"
#include "Base/Utils/Assert.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
SaveThread::SaveThread(QObject* parent) : QThread(parent), m_document(nullptr) {}
diff --git a/GUI/mainwindow/aboutapplicationdialog.cpp b/GUI/mainwindow/aboutapplicationdialog.cpp
index 875a62d06da..68a34ce957b 100644
--- a/GUI/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/mainwindow/aboutapplicationdialog.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/mainwindow/aboutapplicationdialog.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/utils/CustomEventFilters.h"
#include "GUI/utils/Helpers.h"
#include <QDate>
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index a1ea8af84ab..07a29987f2c 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -18,11 +18,11 @@
#include "GUI/Application/Application.h"
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Views/SampleView.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/PyImportAssistant.h"
#include "GUI/mainwindow/aboutapplicationdialog.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/qstringutils.h"
#include <QDesktopServices>
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index f62c1448154..34bf56677a1 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -23,10 +23,10 @@
#include "GUI/Views/SampleView.h"
#include "GUI/Views/SessionModelView.h"
#include "GUI/Views/SimulationView.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/Views/WelcomeView.h"
#include "GUI/mainwindow/actionmanager.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include <QAction>
diff --git a/GUI/mainwindow/newprojectdialog.cpp b/GUI/mainwindow/newprojectdialog.cpp
index 9472b8e7c17..047db054d47 100644
--- a/GUI/mainwindow/newprojectdialog.cpp
+++ b/GUI/mainwindow/newprojectdialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/mainwindow/newprojectdialog.h"
#include "GUI/Application/Application.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QLabel>
diff --git a/GUI/Views/Tools/mainwindow_constants.h b/GUI/utils/mainwindow_constants.h
similarity index 90%
rename from GUI/Views/Tools/mainwindow_constants.h
rename to GUI/utils/mainwindow_constants.h
index 72c1123dece..0838d9660d5 100644
--- a/GUI/Views/Tools/mainwindow_constants.h
+++ b/GUI/utils/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/Tools/mainwindow_constants.h
+//! @file GUI/utils/mainwindow_constants.h
//! @brief Defines namespace GUI::Constants
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 0b3c91ca271..a1d5c1e0409 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -6,7 +6,7 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/SpecularDataItem.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 331ad36e8e4..0d0ca770d7c 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -5,7 +5,7 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/RectangularDetectorItem.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index ba801127b0b..129f76596d5 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -11,7 +11,7 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 8937d307e90..b8bee3f00c8 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -5,8 +5,8 @@
#include "GUI/Models/JobItemUtils.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index db044904c53..79887b6c9aa 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/ItemFileNameUtils.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
#include <QDir>
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 5332555850d..ccf0f933654 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -7,9 +7,9 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/SaveService.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 28de1f026bb..756e1f64c19 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/PointwiseAxisItem.h"
#include "GUI/Models/SpecularBeamInclinationItem.h"
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
index ae5a247dd68..2477978f2b9 100644
--- a/Tests/Unit/GUI/TestScientificSpinBox.cpp
+++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "Tests/GTestWrapper/google_test.h"
#include <limits>
diff --git a/Tests/Unit/GUI/TestSessionItemController.cpp b/Tests/Unit/GUI/TestSessionItemController.cpp
index 04ea3baa1c7..776a2908b5a 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/AxesItems.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
#include <QObject>
diff --git a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
index 2d0e6031421..4ef356f4969 100644
--- a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
+++ b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
@@ -1,6 +1,6 @@
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
#include "GUI/Models/SessionItem.h"
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
TestListener::TestListener()
: m_onItemDestroyedCount(0), m_onPropertyChangeCount(0), m_onWidgetDestroyed(0)
diff --git a/Tests/Unit/GUI/TestUpdateTimer.cpp b/Tests/Unit/GUI/TestUpdateTimer.cpp
index e190926a737..5a6677f6644 100644
--- a/Tests/Unit/GUI/TestUpdateTimer.cpp
+++ b/Tests/Unit/GUI/TestUpdateTimer.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 553035bd401..c4bf83b47b8 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include <QDir>
namespace {
--
GitLab