From 1d219e4df04aea8e00a74a3fa71ed63413a0c640 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sat, 6 Nov 2021 18:48:18 +0100
Subject: [PATCH] rm GUI/Widget
---
GUI/{Widget => View}/Common/DockWidgetInfo.cpp | 4 ++--
GUI/{Widget => View}/Common/DockWidgetInfo.h | 8 ++++----
GUI/{Widget => View}/Common/DocksController.cpp | 4 ++--
GUI/{Widget => View}/Common/DocksController.h | 10 +++++-----
GUI/{Widget => View}/Common/InfoPanel.cpp | 6 +++---
GUI/{Widget => View}/Common/InfoPanel.h | 8 ++++----
.../Common/InfoPanelToolBar.cpp | 4 ++--
GUI/{Widget => View}/Common/InfoPanelToolBar.h | 10 +++++-----
.../Common/ItemComboToolBar.cpp | 4 ++--
GUI/{Widget => View}/Common/ItemComboToolBar.h | 10 +++++-----
GUI/{Widget => View}/Common/ItemComboWidget.cpp | 6 +++---
GUI/{Widget => View}/Common/ItemComboWidget.h | 10 +++++-----
.../Common/ItemSelectorWidget.cpp | 4 ++--
.../Common/ItemSelectorWidget.h | 8 ++++----
.../Common/ItemStackPresenter.h | 10 +++++-----
GUI/{Widget => View}/Common/ItemStackWidget.cpp | 4 ++--
GUI/{Widget => View}/Common/ItemStackWidget.h | 8 ++++----
.../Common/ItemViewOverlayButtons.cpp | 2 +-
.../Common/ItemViewOverlayButtons.h | 8 ++++----
GUI/{Widget => View}/Common/ModelTreeView.cpp | 6 +++---
GUI/{Widget => View}/Common/ModelTreeView.h | 8 ++++----
.../Common/ScientificSpinBox.cpp | 4 ++--
GUI/{Widget => View}/Common/ScientificSpinBox.h | 8 ++++----
.../Common/SessionItemController.cpp | 4 ++--
.../Common/SessionItemController.h | 8 ++++----
.../Common/SessionItemWidget.cpp | 6 +++---
GUI/{Widget => View}/Common/SessionItemWidget.h | 8 ++++----
GUI/{Widget => View}/Common/StyledToolBar.cpp | 4 ++--
GUI/{Widget => View}/Common/StyledToolBar.h | 8 ++++----
GUI/View/FitWidgets/FitParameterWidget.cpp | 2 +-
GUI/View/FitWidgets/FitParameterWidget.h | 2 +-
GUI/View/FitWidgets/JobRealTimeToolBar.h | 2 +-
GUI/View/FitWidgets/JobRealTimeWidget.h | 2 +-
GUI/View/FitWidgets/ParameterTuningDelegate.cpp | 2 +-
GUI/View/FitWidgets/ParameterTuningWidget.h | 2 +-
GUI/View/FitWidgets/RunFitControlWidget.cpp | 2 +-
GUI/View/FitWidgets/RunFitControlWidget.h | 2 +-
GUI/View/Import/RealDataMaskWidget.h | 2 +-
GUI/View/Import/RealDataPresenter.h | 2 +-
GUI/View/Import/RealDataSelectorWidget.cpp | 4 ++--
GUI/View/Info/OverlayLabelWidget.cpp | 4 ++--
GUI/View/Info/ProjectLoadProblemDialog.cpp | 2 +-
GUI/View/Instrument/DistributionForms.cpp | 2 +-
GUI/View/Instrument/InstrumentLibraryEditor.cpp | 4 ++--
GUI/View/Instrument/InstrumentView.cpp | 2 +-
GUI/View/Intensity/ColorMap.cpp | 2 +-
GUI/View/Intensity/ColorMapCanvas.h | 2 +-
GUI/View/Intensity/ColorMapUtils.cpp | 2 +-
GUI/View/Intensity/IntensityDataCanvas.h | 2 +-
.../Intensity/IntensityDataPropertyWidget.cpp | 2 +-
.../Intensity/IntensityDataPropertyWidget.h | 2 +-
GUI/View/Intensity/IntensityDataWidget.h | 2 +-
GUI/View/Intensity/Plot1D.cpp | 2 +-
GUI/View/Intensity/PlotConstants.h | 2 +-
GUI/View/Intensity/ScientificPlot.h | 2 +-
GUI/View/Intensity/StatusLabel.cpp | 2 +-
GUI/View/Job/FitComparisonWidget.h | 2 +-
GUI/View/Job/FitComparisonWidget1D.h | 2 +-
GUI/View/Job/FitFlowWidget.h | 2 +-
GUI/View/Job/JobListView.cpp | 2 +-
GUI/View/Job/JobMessagePanel.h | 2 +-
GUI/View/Job/JobPropertiesWidget.cpp | 2 +-
GUI/View/Job/JobResultsPresenter.h | 2 +-
GUI/View/Job/JobView.cpp | 2 +-
GUI/View/Main/AboutDialog.cpp | 2 +-
GUI/View/Main/AutosaveController.cpp | 2 +-
GUI/View/Main/MainWindow.h | 17 ++++++++---------
GUI/View/Main/ProjectManager.cpp | 2 +-
GUI/View/Main/PyImportAssistant.cpp | 4 ++--
.../MaterialEditor/MaterialEditorDialog.cpp | 2 +-
.../Projection/IntensityDataProjectionsWidget.h | 2 +-
GUI/View/Projection/ProjectionsPlot.h | 2 +-
GUI/View/Projection/ProjectionsPropertyPanel.h | 2 +-
GUI/View/Projection/ProjectionsWidget.h | 2 +-
GUI/View/PropertyEditor/ComponentTreeView.cpp | 2 +-
GUI/View/PropertyEditor/CustomEditors.cpp | 2 +-
.../PropertyEditor/PropertyEditorFactory.cpp | 2 +-
GUI/View/PropertyEditor/TestComponentView.cpp | 2 +-
GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp | 2 +-
GUI/View/RealSpaceWidgets/RealSpaceToolBar.h | 2 +-
GUI/View/SampleDesigner/ConnectableView.cpp | 4 ++--
GUI/View/SampleDesigner/DesignerMimeData.cpp | 2 +-
GUI/View/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/View/SampleDesigner/ILayerView.cpp | 2 +-
GUI/View/SampleDesigner/InterferenceViews.cpp | 2 +-
.../LayerOrientedSampleEditor.cpp | 2 +-
GUI/View/SampleDesigner/LayerView.cpp | 2 +-
GUI/View/SampleDesigner/MesoCrystalView.cpp | 4 ++--
GUI/View/SampleDesigner/MultiLayerView.cpp | 2 +-
GUI/View/SampleDesigner/NodeEditorPort.cpp | 4 ++--
.../SampleDesigner/ParticleCompositionView.cpp | 4 ++--
.../SampleDesigner/ParticleCoreShellView.cpp | 4 ++--
GUI/View/SampleDesigner/ParticleLayoutView.cpp | 2 +-
GUI/View/SampleDesigner/ParticleView.cpp | 4 ++--
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/SampleDesigner/SampleToolBar.h | 2 +-
GUI/View/SampleDesigner/SampleViewAligner.cpp | 2 +-
GUI/View/SampleDesigner/ScriptPanel.cpp | 4 ++--
GUI/View/SampleDesigner/ScriptPanel.h | 2 +-
GUI/View/SampleDesigner/TransformationView.cpp | 2 +-
GUI/View/Script/PythonScriptWidget.cpp | 6 +++---
GUI/View/SpecularDataWidgets/Plot1DCanvas.h | 2 +-
.../SpecularDataWidgets/SpecularDataCanvas.h | 2 +-
.../SpecularDataImportWidget.h | 2 +-
.../SpecularDataImportWidget.ui | 2 +-
.../SpecularDataWidgets/SpecularDataWidget.h | 2 +-
GUI/View/SpecularDataWidgets/SpecularPlot.cpp | 2 +-
.../SpecularDataWidgets/SpecularPlotCanvas.h | 2 +-
.../Common => View/Tool}/DesignerHelper.cpp | 6 +++---
.../Common => View/Tool}/DesignerHelper.h | 8 ++++----
GUI/{Widget/Common => View/Tool}/StyleUtils.cpp | 6 +++---
GUI/{Widget/Common => View/Tool}/StyleUtils.h | 8 ++++----
.../Common => View/Tool}/UpdateTimer.cpp | 4 ++--
GUI/{Widget/Common => View/Tool}/UpdateTimer.h | 8 ++++----
GUI/View/Toplevel/ImportDataView.h | 2 +-
GUI/View/Toplevel/SampleView.cpp | 2 +-
GUI/View/Toplevel/SessionModelView.cpp | 2 +-
Tests/Unit/GUI/TestScientificSpinBox.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemController.cpp | 2 +-
.../GUI/TestSessionItemControllerHelper.cpp | 2 +-
Tests/Unit/GUI/TestUpdateTimer.cpp | 2 +-
121 files changed, 222 insertions(+), 223 deletions(-)
rename GUI/{Widget => View}/Common/DockWidgetInfo.cpp (91%)
rename GUI/{Widget => View}/Common/DockWidgetInfo.h (82%)
rename GUI/{Widget => View}/Common/DocksController.cpp (98%)
rename GUI/{Widget => View}/Common/DocksController.h (88%)
rename GUI/{Widget => View}/Common/InfoPanel.cpp (96%)
rename GUI/{Widget => View}/Common/InfoPanel.h (87%)
rename GUI/{Widget => View}/Common/InfoPanelToolBar.cpp (94%)
rename GUI/{Widget => View}/Common/InfoPanelToolBar.h (78%)
rename GUI/{Widget => View}/Common/ItemComboToolBar.cpp (96%)
rename GUI/{Widget => View}/Common/ItemComboToolBar.h (84%)
rename GUI/{Widget => View}/Common/ItemComboWidget.cpp (96%)
rename GUI/{Widget => View}/Common/ItemComboWidget.h (90%)
rename GUI/{Widget => View}/Common/ItemSelectorWidget.cpp (97%)
rename GUI/{Widget => View}/Common/ItemSelectorWidget.h (89%)
rename GUI/{Widget => View}/Common/ItemStackPresenter.h (92%)
rename GUI/{Widget => View}/Common/ItemStackWidget.cpp (96%)
rename GUI/{Widget => View}/Common/ItemStackWidget.h (88%)
rename GUI/{Widget => View}/Common/ItemViewOverlayButtons.cpp (99%)
rename GUI/{Widget => View}/Common/ItemViewOverlayButtons.h (83%)
rename GUI/{Widget => View}/Common/ModelTreeView.cpp (93%)
rename GUI/{Widget => View}/Common/ModelTreeView.h (85%)
rename GUI/{Widget => View}/Common/ScientificSpinBox.cpp (97%)
rename GUI/{Widget => View}/Common/ScientificSpinBox.h (89%)
rename GUI/{Widget => View}/Common/SessionItemController.cpp (95%)
rename GUI/{Widget => View}/Common/SessionItemController.h (85%)
rename GUI/{Widget => View}/Common/SessionItemWidget.cpp (90%)
rename GUI/{Widget => View}/Common/SessionItemWidget.h (87%)
rename GUI/{Widget => View}/Common/StyledToolBar.cpp (93%)
rename GUI/{Widget => View}/Common/StyledToolBar.h (82%)
rename GUI/{Widget/Common => View/Tool}/DesignerHelper.cpp (98%)
rename GUI/{Widget/Common => View/Tool}/DesignerHelper.h (92%)
rename GUI/{Widget/Common => View/Tool}/StyleUtils.cpp (96%)
rename GUI/{Widget/Common => View/Tool}/StyleUtils.h (87%)
rename GUI/{Widget/Common => View/Tool}/UpdateTimer.cpp (94%)
rename GUI/{Widget/Common => View/Tool}/UpdateTimer.h (86%)
diff --git a/GUI/Widget/Common/DockWidgetInfo.cpp b/GUI/View/Common/DockWidgetInfo.cpp
similarity index 91%
rename from GUI/Widget/Common/DockWidgetInfo.cpp
rename to GUI/View/Common/DockWidgetInfo.cpp
index e6af5d1e2ef..1c6ecc62c5b 100644
--- a/GUI/Widget/Common/DockWidgetInfo.cpp
+++ b/GUI/View/Common/DockWidgetInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/DockWidgetInfo.cpp
+//! @file GUI/View/Common/DockWidgetInfo.cpp
//! @brief Implements class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/DockWidgetInfo.h"
+#include "GUI/View/Common/DockWidgetInfo.h"
#include <QDockWidget>
#include <QWidget>
diff --git a/GUI/Widget/Common/DockWidgetInfo.h b/GUI/View/Common/DockWidgetInfo.h
similarity index 82%
rename from GUI/Widget/Common/DockWidgetInfo.h
rename to GUI/View/Common/DockWidgetInfo.h
index 6f1cca86861..e734e979e1c 100644
--- a/GUI/Widget/Common/DockWidgetInfo.h
+++ b/GUI/View/Common/DockWidgetInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/DockWidgetInfo.h
+//! @file GUI/View/Common/DockWidgetInfo.h
//! @brief Defines class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DOCKWIDGETINFO_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_DOCKWIDGETINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_DOCKWIDGETINFO_H
+#define BORNAGAIN_GUI_VIEW_COMMON_DOCKWIDGETINFO_H
#include <qnamespace.h>
@@ -37,4 +37,4 @@ private:
Qt::DockWidgetArea m_area;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_DOCKWIDGETINFO_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_DOCKWIDGETINFO_H
diff --git a/GUI/Widget/Common/DocksController.cpp b/GUI/View/Common/DocksController.cpp
similarity index 98%
rename from GUI/Widget/Common/DocksController.cpp
rename to GUI/View/Common/DocksController.cpp
index 5ecb64ba735..c53abb217f4 100644
--- a/GUI/Widget/Common/DocksController.cpp
+++ b/GUI/View/Common/DocksController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/DocksController.cpp
+//! @file GUI/View/Common/DocksController.cpp
//! @brief Implements class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/DocksController.h"
+#include "GUI/View/Common/DocksController.h"
#include "Base/Utils/Assert.h"
#include "GUI/Util/Error.h"
#include <QAbstractItemView>
diff --git a/GUI/Widget/Common/DocksController.h b/GUI/View/Common/DocksController.h
similarity index 88%
rename from GUI/Widget/Common/DocksController.h
rename to GUI/View/Common/DocksController.h
index 85342fe351c..28504494f74 100644
--- a/GUI/Widget/Common/DocksController.h
+++ b/GUI/View/Common/DocksController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/DocksController.h
+//! @file GUI/View/Common/DocksController.h
//! @brief Defines class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DOCKSCONTROLLER_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_DOCKSCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_DOCKSCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_COMMON_DOCKSCONTROLLER_H
-#include "GUI/Widget/Common/DockWidgetInfo.h"
+#include "GUI/View/Common/DockWidgetInfo.h"
#include <QObject>
#include <QSize>
#include <map>
@@ -72,4 +72,4 @@ private:
bool m_handleDockVisibilityChanges = true;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_DOCKSCONTROLLER_H
diff --git a/GUI/Widget/Common/InfoPanel.cpp b/GUI/View/Common/InfoPanel.cpp
similarity index 96%
rename from GUI/Widget/Common/InfoPanel.cpp
rename to GUI/View/Common/InfoPanel.cpp
index b97a116b0c7..5790e46b9c4 100644
--- a/GUI/Widget/Common/InfoPanel.cpp
+++ b/GUI/View/Common/InfoPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/InfoPanel.cpp
+//! @file GUI/View/Common/InfoPanel.cpp
//! @brief Declares class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/InfoPanel.h"
-#include "GUI/Widget/Common/InfoPanelToolBar.h"
+#include "GUI/View/Common/InfoPanel.h"
+#include "GUI/View/Common/InfoPanelToolBar.h"
#include <QBoxLayout>
#include <QResizeEvent>
#include <QStackedWidget>
diff --git a/GUI/Widget/Common/InfoPanel.h b/GUI/View/Common/InfoPanel.h
similarity index 87%
rename from GUI/Widget/Common/InfoPanel.h
rename to GUI/View/Common/InfoPanel.h
index 215e22a860f..c9d4f583e2c 100644
--- a/GUI/Widget/Common/InfoPanel.h
+++ b/GUI/View/Common/InfoPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/InfoPanel.h
+//! @file GUI/View/Common/InfoPanel.h
//! @brief Defines class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_INFOPANEL_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_INFOPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_INFOPANEL_H
+#define BORNAGAIN_GUI_VIEW_COMMON_INFOPANEL_H
#include <QFrame>
@@ -51,4 +51,4 @@ protected:
int m_cached_height;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_INFOPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_INFOPANEL_H
diff --git a/GUI/Widget/Common/InfoPanelToolBar.cpp b/GUI/View/Common/InfoPanelToolBar.cpp
similarity index 94%
rename from GUI/Widget/Common/InfoPanelToolBar.cpp
rename to GUI/View/Common/InfoPanelToolBar.cpp
index 650eb790f1e..af1aa5997f6 100644
--- a/GUI/Widget/Common/InfoPanelToolBar.cpp
+++ b/GUI/View/Common/InfoPanelToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/InfoPanelToolBar.cpp
+//! @file GUI/View/Common/InfoPanelToolBar.cpp
//! @brief Declares class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/InfoPanelToolBar.h"
+#include "GUI/View/Common/InfoPanelToolBar.h"
#include <QAction>
#include <QHBoxLayout>
#include <QToolButton>
diff --git a/GUI/Widget/Common/InfoPanelToolBar.h b/GUI/View/Common/InfoPanelToolBar.h
similarity index 78%
rename from GUI/Widget/Common/InfoPanelToolBar.h
rename to GUI/View/Common/InfoPanelToolBar.h
index ea97e276cda..c12e7acd24e 100644
--- a/GUI/Widget/Common/InfoPanelToolBar.h
+++ b/GUI/View/Common/InfoPanelToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/InfoPanelToolBar.h
+//! @file GUI/View/Common/InfoPanelToolBar.h
//! @brief Defines class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_INFOPANELTOOLBAR_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_INFOPANELTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_INFOPANELTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_COMMON_INFOPANELTOOLBAR_H
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
class QAction;
@@ -41,4 +41,4 @@ private:
bool m_expanded;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_INFOPANELTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_INFOPANELTOOLBAR_H
diff --git a/GUI/Widget/Common/ItemComboToolBar.cpp b/GUI/View/Common/ItemComboToolBar.cpp
similarity index 96%
rename from GUI/Widget/Common/ItemComboToolBar.cpp
rename to GUI/View/Common/ItemComboToolBar.cpp
index b7f4cfc830e..555b2f43f46 100644
--- a/GUI/Widget/Common/ItemComboToolBar.cpp
+++ b/GUI/View/Common/ItemComboToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemComboToolBar.cpp
+//! @file GUI/View/Common/ItemComboToolBar.cpp
//! @brief Implements class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/ItemComboToolBar.h"
+#include "GUI/View/Common/ItemComboToolBar.h"
#include "Base/Utils/Assert.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/Widget/Common/ItemComboToolBar.h b/GUI/View/Common/ItemComboToolBar.h
similarity index 84%
rename from GUI/Widget/Common/ItemComboToolBar.h
rename to GUI/View/Common/ItemComboToolBar.h
index bcc5082f7b7..25b4fdd072c 100644
--- a/GUI/Widget/Common/ItemComboToolBar.h
+++ b/GUI/View/Common/ItemComboToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemComboToolBar.h
+//! @file GUI/View/Common/ItemComboToolBar.h
//! @brief Defines class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOTOOLBAR_H
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include <QList>
class QAction;
@@ -51,4 +51,4 @@ private:
QAction* m_comboBoxAction;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/Widget/Common/ItemComboWidget.cpp b/GUI/View/Common/ItemComboWidget.cpp
similarity index 96%
rename from GUI/Widget/Common/ItemComboWidget.cpp
rename to GUI/View/Common/ItemComboWidget.cpp
index 36521ccfe3f..db71d612bf1 100644
--- a/GUI/Widget/Common/ItemComboWidget.cpp
+++ b/GUI/View/Common/ItemComboWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemComboWidget.cpp
+//! @file GUI/View/Common/ItemComboWidget.cpp
//! @brief Implements class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/ItemComboWidget.h"
+#include "GUI/View/Common/ItemComboWidget.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Widget/Common/ItemComboToolBar.h"
+#include "GUI/View/Common/ItemComboToolBar.h"
#include <QComboBox>
#include <QEvent>
#include <QStackedWidget>
diff --git a/GUI/Widget/Common/ItemComboWidget.h b/GUI/View/Common/ItemComboWidget.h
similarity index 90%
rename from GUI/Widget/Common/ItemComboWidget.h
rename to GUI/View/Common/ItemComboWidget.h
index cbe459ff522..26e4601395b 100644
--- a/GUI/Widget/Common/ItemComboWidget.h
+++ b/GUI/View/Common/ItemComboWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemComboWidget.h
+//! @file GUI/View/Common/ItemComboWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOWIDGET_H
#include "Base/Utils/IFactory.h"
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <QMap>
#include <QString>
#include <QWidget>
@@ -72,4 +72,4 @@ private:
QWidget* m_blankWidget;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOWIDGET_H
diff --git a/GUI/Widget/Common/ItemSelectorWidget.cpp b/GUI/View/Common/ItemSelectorWidget.cpp
similarity index 97%
rename from GUI/Widget/Common/ItemSelectorWidget.cpp
rename to GUI/View/Common/ItemSelectorWidget.cpp
index a9afa4fa360..a9bd7a3ea44 100644
--- a/GUI/Widget/Common/ItemSelectorWidget.cpp
+++ b/GUI/View/Common/ItemSelectorWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemSelectorWidget.cpp
+//! @file GUI/View/Common/ItemSelectorWidget.cpp
//! @brief Implements class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/ItemSelectorWidget.h"
+#include "GUI/View/Common/ItemSelectorWidget.h"
#include "GUI/Model/Session/SessionDecorationModel.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/mainwindow_constants.h"
diff --git a/GUI/Widget/Common/ItemSelectorWidget.h b/GUI/View/Common/ItemSelectorWidget.h
similarity index 89%
rename from GUI/Widget/Common/ItemSelectorWidget.h
rename to GUI/View/Common/ItemSelectorWidget.h
index b44245932a1..492bf86a7fb 100644
--- a/GUI/Widget/Common/ItemSelectorWidget.h
+++ b/GUI/View/Common/ItemSelectorWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemSelectorWidget.h
+//! @file GUI/View/Common/ItemSelectorWidget.h
//! @brief Defines class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMSELECTORWIDGET_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMSELECTORWIDGET_H
+#define BORNAGAIN_GUI_VIEW_COMMON_ITEMSELECTORWIDGET_H
#include <QItemSelectionModel>
#include <QWidget>
@@ -69,4 +69,4 @@ protected:
std::unique_ptr<SessionDecorationModel> m_decorationModel;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_ITEMSELECTORWIDGET_H
diff --git a/GUI/Widget/Common/ItemStackPresenter.h b/GUI/View/Common/ItemStackPresenter.h
similarity index 92%
rename from GUI/Widget/Common/ItemStackPresenter.h
rename to GUI/View/Common/ItemStackPresenter.h
index 4760091a807..bd11b248894 100644
--- a/GUI/Widget/Common/ItemStackPresenter.h
+++ b/GUI/View/Common/ItemStackPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemStackPresenter.h
+//! @file GUI/View/Common/ItemStackPresenter.h
//! @brief Defines class ItemStackPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKPRESENTER_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMSTACKPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_COMMON_ITEMSTACKPRESENTER_H
#include "Base/Utils/Assert.h"
-#include "GUI/Widget/Common/ItemStackWidget.h"
+#include "GUI/View/Common/ItemStackWidget.h"
#include <QMap>
#include <QStackedWidget>
@@ -132,4 +132,4 @@ template <class T> void ItemStackPresenter<T>::removeWidgets()
m_itemToWidget.clear();
}
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_ITEMSTACKPRESENTER_H
diff --git a/GUI/Widget/Common/ItemStackWidget.cpp b/GUI/View/Common/ItemStackWidget.cpp
similarity index 96%
rename from GUI/Widget/Common/ItemStackWidget.cpp
rename to GUI/View/Common/ItemStackWidget.cpp
index c25cc4d3865..07a1165ea56 100644
--- a/GUI/Widget/Common/ItemStackWidget.cpp
+++ b/GUI/View/Common/ItemStackWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemStackWidget.cpp
+//! @file GUI/View/Common/ItemStackWidget.cpp
//! @brief Implements class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/ItemStackWidget.h"
+#include "GUI/View/Common/ItemStackWidget.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/Error.h"
#include <QStackedWidget>
diff --git a/GUI/Widget/Common/ItemStackWidget.h b/GUI/View/Common/ItemStackWidget.h
similarity index 88%
rename from GUI/Widget/Common/ItemStackWidget.h
rename to GUI/View/Common/ItemStackWidget.h
index 575477bf10a..a1d1ce780fc 100644
--- a/GUI/Widget/Common/ItemStackWidget.h
+++ b/GUI/View/Common/ItemStackWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemStackWidget.h
+//! @file GUI/View/Common/ItemStackWidget.h
//! @brief Defines class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKWIDGET_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMSTACKWIDGET_H
+#define BORNAGAIN_GUI_VIEW_COMMON_ITEMSTACKWIDGET_H
#include <QWidget>
@@ -56,4 +56,4 @@ protected:
QSize m_size_hint;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_ITEMSTACKWIDGET_H
diff --git a/GUI/Widget/Common/ItemViewOverlayButtons.cpp b/GUI/View/Common/ItemViewOverlayButtons.cpp
similarity index 99%
rename from GUI/Widget/Common/ItemViewOverlayButtons.cpp
rename to GUI/View/Common/ItemViewOverlayButtons.cpp
index 4d7aca0bc9d..08a8c5f1ada 100644
--- a/GUI/Widget/Common/ItemViewOverlayButtons.cpp
+++ b/GUI/View/Common/ItemViewOverlayButtons.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemViewOverlayButtons.cpp
+//! @file GUI/View/Common/ItemViewOverlayButtons.cpp
//! @brief Implements class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/Widget/Common/ItemViewOverlayButtons.h b/GUI/View/Common/ItemViewOverlayButtons.h
similarity index 83%
rename from GUI/Widget/Common/ItemViewOverlayButtons.h
rename to GUI/View/Common/ItemViewOverlayButtons.h
index 1f7e5c3b14c..996d489c031 100644
--- a/GUI/Widget/Common/ItemViewOverlayButtons.h
+++ b/GUI/View/Common/ItemViewOverlayButtons.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ItemViewOverlayButtons.h
+//! @file GUI/View/Common/ItemViewOverlayButtons.h
//! @brief Defines class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMVIEWOVERLAYBUTTONS_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#define BORNAGAIN_GUI_VIEW_COMMON_ITEMVIEWOVERLAYBUTTONS_H
#include <QObject>
#include <functional>
@@ -42,4 +42,4 @@ private:
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_ITEMVIEWOVERLAYBUTTONS_H
diff --git a/GUI/Widget/Common/ModelTreeView.cpp b/GUI/View/Common/ModelTreeView.cpp
similarity index 93%
rename from GUI/Widget/Common/ModelTreeView.cpp
rename to GUI/View/Common/ModelTreeView.cpp
index 2d7e77f5d15..7af84cdfa24 100644
--- a/GUI/Widget/Common/ModelTreeView.cpp
+++ b/GUI/View/Common/ModelTreeView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ModelTreeView.cpp
+//! @file GUI/View/Common/ModelTreeView.cpp
//! @brief Implements class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/ModelTreeView.h"
+#include "GUI/View/Common/ModelTreeView.h"
#include "GUI/Model/Session/SessionDecorationModel.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/Error.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Widget/Common/ModelTreeView.h b/GUI/View/Common/ModelTreeView.h
similarity index 85%
rename from GUI/Widget/Common/ModelTreeView.h
rename to GUI/View/Common/ModelTreeView.h
index e158e2cbf86..a10255fe68b 100644
--- a/GUI/Widget/Common/ModelTreeView.h
+++ b/GUI/View/Common/ModelTreeView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ModelTreeView.h
+//! @file GUI/View/Common/ModelTreeView.h
//! @brief Defines class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_MODELTREEVIEW_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_MODELTREEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_MODELTREEVIEW_H
+#define BORNAGAIN_GUI_VIEW_COMMON_MODELTREEVIEW_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
bool m_is_expanded;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_MODELTREEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_MODELTREEVIEW_H
diff --git a/GUI/Widget/Common/ScientificSpinBox.cpp b/GUI/View/Common/ScientificSpinBox.cpp
similarity index 97%
rename from GUI/Widget/Common/ScientificSpinBox.cpp
rename to GUI/View/Common/ScientificSpinBox.cpp
index 2f935c1ca6c..9dc56aa24b7 100644
--- a/GUI/Widget/Common/ScientificSpinBox.cpp
+++ b/GUI/View/Common/ScientificSpinBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ScientificSpinBox.cpp
+//! @file GUI/View/Common/ScientificSpinBox.cpp
//! @brief Implements class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/ScientificSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
#include <QLineEdit>
#include <cmath>
diff --git a/GUI/Widget/Common/ScientificSpinBox.h b/GUI/View/Common/ScientificSpinBox.h
similarity index 89%
rename from GUI/Widget/Common/ScientificSpinBox.h
rename to GUI/View/Common/ScientificSpinBox.h
index 9e47cafeb1a..8f635afc165 100644
--- a/GUI/Widget/Common/ScientificSpinBox.h
+++ b/GUI/View/Common/ScientificSpinBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/ScientificSpinBox.h
+//! @file GUI/View/Common/ScientificSpinBox.h
//! @brief Defines class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_SCIENTIFICSPINBOX_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_SCIENTIFICSPINBOX_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_SCIENTIFICSPINBOX_H
+#define BORNAGAIN_GUI_VIEW_COMMON_SCIENTIFICSPINBOX_H
#include <QAbstractSpinBox>
@@ -66,4 +66,4 @@ private:
QDoubleValidator m_validator;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_SCIENTIFICSPINBOX_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_SCIENTIFICSPINBOX_H
diff --git a/GUI/Widget/Common/SessionItemController.cpp b/GUI/View/Common/SessionItemController.cpp
similarity index 95%
rename from GUI/Widget/Common/SessionItemController.cpp
rename to GUI/View/Common/SessionItemController.cpp
index 51e943165e5..0e0d20a00d8 100644
--- a/GUI/Widget/Common/SessionItemController.cpp
+++ b/GUI/View/Common/SessionItemController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/SessionItemController.cpp
+//! @file GUI/View/Common/SessionItemController.cpp
//! @brief Implements class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/SessionItemController.h"
+#include "GUI/View/Common/SessionItemController.h"
#include "GUI/Model/Session/SessionItem.h"
SessionItemController::SessionItemController(QObject* prt)
diff --git a/GUI/Widget/Common/SessionItemController.h b/GUI/View/Common/SessionItemController.h
similarity index 85%
rename from GUI/Widget/Common/SessionItemController.h
rename to GUI/View/Common/SessionItemController.h
index dffb2d6c4e8..98339e43514 100644
--- a/GUI/Widget/Common/SessionItemController.h
+++ b/GUI/View/Common/SessionItemController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/SessionItemController.h
+//! @file GUI/View/Common/SessionItemController.h
//! @brief Defines class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMCONTROLLER_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_SESSIONITEMCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_COMMON_SESSIONITEMCONTROLLER_H
#include <QObject>
#include <functional>
@@ -53,4 +53,4 @@ private:
bool m_parent_subscribed;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_SESSIONITEMCONTROLLER_H
diff --git a/GUI/Widget/Common/SessionItemWidget.cpp b/GUI/View/Common/SessionItemWidget.cpp
similarity index 90%
rename from GUI/Widget/Common/SessionItemWidget.cpp
rename to GUI/View/Common/SessionItemWidget.cpp
index 07708b77f3b..825066d3af7 100644
--- a/GUI/Widget/Common/SessionItemWidget.cpp
+++ b/GUI/View/Common/SessionItemWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/SessionItemWidget.cpp
+//! @file GUI/View/Common/SessionItemWidget.cpp
//! @brief Declares class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/SessionItemWidget.h"
-#include "GUI/Widget/Common/SessionItemController.h"
+#include "GUI/View/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemController.h"
SessionItemWidget::SessionItemWidget(QWidget* parent)
: QWidget(parent), m_itemController(new SessionItemController(this))
diff --git a/GUI/Widget/Common/SessionItemWidget.h b/GUI/View/Common/SessionItemWidget.h
similarity index 87%
rename from GUI/Widget/Common/SessionItemWidget.h
rename to GUI/View/Common/SessionItemWidget.h
index b7ecebcb3b8..368f8d9fae4 100644
--- a/GUI/Widget/Common/SessionItemWidget.h
+++ b/GUI/View/Common/SessionItemWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/SessionItemWidget.h
+//! @file GUI/View/Common/SessionItemWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMWIDGET_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_SESSIONITEMWIDGET_H
+#define BORNAGAIN_GUI_VIEW_COMMON_SESSIONITEMWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
SessionItemController* m_itemController;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_SESSIONITEMWIDGET_H
diff --git a/GUI/Widget/Common/StyledToolBar.cpp b/GUI/View/Common/StyledToolBar.cpp
similarity index 93%
rename from GUI/Widget/Common/StyledToolBar.cpp
rename to GUI/View/Common/StyledToolBar.cpp
index bb884be6324..a6dc5d2a6b2 100644
--- a/GUI/Widget/Common/StyledToolBar.cpp
+++ b/GUI/View/Common/StyledToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/StyledToolBar.cpp
+//! @file GUI/View/Common/StyledToolBar.cpp
//! @brief Implements class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include <QLabel>
#include <QStyle>
diff --git a/GUI/Widget/Common/StyledToolBar.h b/GUI/View/Common/StyledToolBar.h
similarity index 82%
rename from GUI/Widget/Common/StyledToolBar.h
rename to GUI/View/Common/StyledToolBar.h
index 9ead147c741..d207b8a7934 100644
--- a/GUI/Widget/Common/StyledToolBar.h
+++ b/GUI/View/Common/StyledToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/StyledToolBar.h
+//! @file GUI/View/Common/StyledToolBar.h
//! @brief Defines class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_COMMON_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_STYLEDTOOLBAR_H
diff --git a/GUI/View/FitWidgets/FitParameterWidget.cpp b/GUI/View/FitWidgets/FitParameterWidget.cpp
index 538e55b71d7..c0ffd707fa2 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/View/FitWidgets/FitParameterWidget.cpp
@@ -23,9 +23,9 @@
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
+#include "GUI/View/Info/OverlayLabelController.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
-#include "GUI/View/Info/OverlayLabelController.h"
#include <QAction>
#include <QMenu>
#include <QTreeView>
diff --git a/GUI/View/FitWidgets/FitParameterWidget.h b/GUI/View/FitWidgets/FitParameterWidget.h
index 20ad611deeb..d1f54346b16 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.h
+++ b/GUI/View/FitWidgets/FitParameterWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <memory>
class JobItem;
diff --git a/GUI/View/FitWidgets/JobRealTimeToolBar.h b/GUI/View/FitWidgets/JobRealTimeToolBar.h
index c263cf2c3ad..4fc8cd81d4f 100644
--- a/GUI/View/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/View/FitWidgets/JobRealTimeToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
class QToolButton;
diff --git a/GUI/View/FitWidgets/JobRealTimeWidget.h b/GUI/View/FitWidgets/JobRealTimeWidget.h
index 40f89c47913..98c2d288fef 100644
--- a/GUI/View/FitWidgets/JobRealTimeWidget.h
+++ b/GUI/View/FitWidgets/JobRealTimeWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
-#include "GUI/Widget/Common/ItemStackPresenter.h"
+#include "GUI/View/Common/ItemStackPresenter.h"
class JobModel;
class JobItem;
diff --git a/GUI/View/FitWidgets/ParameterTuningDelegate.cpp b/GUI/View/FitWidgets/ParameterTuningDelegate.cpp
index dd5b0a066b7..1c9533713e6 100644
--- a/GUI/View/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/View/FitWidgets/ParameterTuningDelegate.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Model/Session/SessionItemUtils.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Widget/Common/ScientificSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QHBoxLayout>
diff --git a/GUI/View/FitWidgets/ParameterTuningWidget.h b/GUI/View/FitWidgets/ParameterTuningWidget.h
index a0d9dfa71bf..999bfa89b8b 100644
--- a/GUI/View/FitWidgets/ParameterTuningWidget.h
+++ b/GUI/View/FitWidgets/ParameterTuningWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class JobRealTimeToolBar;
class JobModel;
diff --git a/GUI/View/FitWidgets/RunFitControlWidget.cpp b/GUI/View/FitWidgets/RunFitControlWidget.cpp
index 9e98e4fb6ca..6b65619b5a4 100644
--- a/GUI/View/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/View/FitWidgets/RunFitControlWidget.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/View/Info/CautionSign.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/View/FitWidgets/RunFitControlWidget.h b/GUI/View/FitWidgets/RunFitControlWidget.h
index efa08d14c0c..1fef84cfabf 100644
--- a/GUI/View/FitWidgets/RunFitControlWidget.h
+++ b/GUI/View/FitWidgets/RunFitControlWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <QWidget>
class JobItem;
diff --git a/GUI/View/Import/RealDataMaskWidget.h b/GUI/View/Import/RealDataMaskWidget.h
index 3fe698f19aa..8837db5715d 100644
--- a/GUI/View/Import/RealDataMaskWidget.h
+++ b/GUI/View/Import/RealDataMaskWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class SessionItem;
class MaskEditor;
diff --git a/GUI/View/Import/RealDataPresenter.h b/GUI/View/Import/RealDataPresenter.h
index e0a2415530a..d977faa27b4 100644
--- a/GUI/View/Import/RealDataPresenter.h
+++ b/GUI/View/Import/RealDataPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
-#include "GUI/Widget/Common/ItemComboWidget.h"
+#include "GUI/View/Common/ItemComboWidget.h"
class RealDataMaskWidget;
class QAction;
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 0c7c03746eb..849e3418cab 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -20,14 +20,14 @@
#include "GUI/Model/IO/AbstractDataLoader1D.h"
#include "GUI/Model/IO/DataLoaders1D.h"
#include "GUI/Util/Error.h"
+#include "GUI/View/Common/ItemViewOverlayButtons.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Import/ImportDataUtils.h"
#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/View/Tool/MessageBox.h"
-#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
-#include "GUI/Widget/Common/StyledToolBar.h"
#include <QFileDialog>
#include <QItemSelectionModel>
#include <QLineEdit>
diff --git a/GUI/View/Info/OverlayLabelWidget.cpp b/GUI/View/Info/OverlayLabelWidget.cpp
index faf0aca86e5..997c876c4d5 100644
--- a/GUI/View/Info/OverlayLabelWidget.cpp
+++ b/GUI/View/Info/OverlayLabelWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Info/OverlayLabelWidget.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/View/Info/ProjectLoadProblemDialog.cpp b/GUI/View/Info/ProjectLoadProblemDialog.cpp
index eca9332ec87..01b2f1bfd2e 100644
--- a/GUI/View/Info/ProjectLoadProblemDialog.cpp
+++ b/GUI/View/Info/ProjectLoadProblemDialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Info/ProjectLoadProblemDialog.h"
#include "GUI/Util/Path.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLabel>
diff --git a/GUI/View/Instrument/DistributionForms.cpp b/GUI/View/Instrument/DistributionForms.cpp
index 6e8c76651c9..ba829d23b0c 100644
--- a/GUI/View/Instrument/DistributionForms.cpp
+++ b/GUI/View/Instrument/DistributionForms.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Instrument/DistributionForms.h"
#include "GUI/Model/Group/DistributionItems.h"
#include "GUI/Model/Types/ItemWithDistribution.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
#include "GUI/View/Instrument/DistributionEditor.h"
-#include "GUI/Widget/Common/ScientificSpinBox.h"
#include <QDoubleSpinBox>
#include <QFormLayout>
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index 6c0649badcf..3a9ac22cbc5 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -17,9 +17,9 @@
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include "GUI/View/Instrument/Detail/CreateDetails.h"
-#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include "ui_InstrumentLibraryEditor.h"
#include <QAction>
#include <QFormLayout>
diff --git a/GUI/View/Instrument/InstrumentView.cpp b/GUI/View/Instrument/InstrumentView.cpp
index 134653d3b22..ec718d8e2c1 100644
--- a/GUI/View/Instrument/InstrumentView.cpp
+++ b/GUI/View/Instrument/InstrumentView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Instrument/InstrumentEditor.h"
#include "GUI/View/Instrument/InstrumentListView.h"
-#include "GUI/Widget/Common/StyledToolBar.h"
#include <QBoxLayout>
InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
diff --git a/GUI/View/Intensity/ColorMap.cpp b/GUI/View/Intensity/ColorMap.cpp
index 5c0ee097675..9dfe0dd4d3d 100644
--- a/GUI/View/Intensity/ColorMap.cpp
+++ b/GUI/View/Intensity/ColorMap.cpp
@@ -18,7 +18,7 @@
#include "GUI/View/Intensity/ColorMapUtils.h"
#include "GUI/View/Intensity/PlotConstants.h"
#include "GUI/View/Intensity/PlotEventInfo.h"
-#include "GUI/Widget/Common/UpdateTimer.h"
+#include "GUI/View/Tool/UpdateTimer.h"
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/View/Intensity/ColorMapCanvas.h b/GUI/View/Intensity/ColorMapCanvas.h
index 99292caaf76..dab35001d2d 100644
--- a/GUI/View/Intensity/ColorMapCanvas.h
+++ b/GUI/View/Intensity/ColorMapCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INTENSITY_COLORMAPCANVAS_H
#define BORNAGAIN_GUI_VIEW_INTENSITY_COLORMAPCANVAS_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class ColorMap;
class FontScalingEvent;
diff --git a/GUI/View/Intensity/ColorMapUtils.cpp b/GUI/View/Intensity/ColorMapUtils.cpp
index e86c98b9e1e..6f0ba2cf1e4 100644
--- a/GUI/View/Intensity/ColorMapUtils.cpp
+++ b/GUI/View/Intensity/ColorMapUtils.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Intensity/ColorMapUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/View/Intensity/IntensityDataCanvas.h b/GUI/View/Intensity/IntensityDataCanvas.h
index 0bb7bcc6890..c299eaf7474 100644
--- a/GUI/View/Intensity/IntensityDataCanvas.h
+++ b/GUI/View/Intensity/IntensityDataCanvas.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEW_INTENSITY_INTENSITYDATACANVAS_H
#include "Device/Data/OutputData.h"
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/View/Intensity/IntensityDataPropertyWidget.cpp b/GUI/View/Intensity/IntensityDataPropertyWidget.cpp
index bbca7387b4c..cf0d75284b3 100644
--- a/GUI/View/Intensity/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Intensity/IntensityDataPropertyWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Intensity/IntensityDataPropertyWidget.h"
#include "GUI/View/PropertyEditor/ComponentEditor.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/View/Intensity/IntensityDataPropertyWidget.h b/GUI/View/Intensity/IntensityDataPropertyWidget.h
index 76c6c26ec95..43984ad0912 100644
--- a/GUI/View/Intensity/IntensityDataPropertyWidget.h
+++ b/GUI/View/Intensity/IntensityDataPropertyWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INTENSITY_INTENSITYDATAPROPERTYWIDGET_H
#define BORNAGAIN_GUI_VIEW_INTENSITY_INTENSITYDATAPROPERTYWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class IntensityDataItem;
class ComponentEditor;
diff --git a/GUI/View/Intensity/IntensityDataWidget.h b/GUI/View/Intensity/IntensityDataWidget.h
index 8ed3d86bf4c..c81db3b8ed2 100644
--- a/GUI/View/Intensity/IntensityDataWidget.h
+++ b/GUI/View/Intensity/IntensityDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INTENSITY_INTENSITYDATAWIDGET_H
#define BORNAGAIN_GUI_VIEW_INTENSITY_INTENSITYDATAWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/View/Intensity/Plot1D.cpp b/GUI/View/Intensity/Plot1D.cpp
index a1045dd3041..2c18c928607 100644
--- a/GUI/View/Intensity/Plot1D.cpp
+++ b/GUI/View/Intensity/Plot1D.cpp
@@ -21,7 +21,7 @@
#include "GUI/View/Intensity/ColorMapUtils.h"
#include "GUI/View/Intensity/PlotConstants.h"
#include "GUI/View/Intensity/PlotEventInfo.h"
-#include "GUI/Widget/Common/UpdateTimer.h"
+#include "GUI/View/Tool/UpdateTimer.h"
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/View/Intensity/PlotConstants.h b/GUI/View/Intensity/PlotConstants.h
index 7871d7b456e..383632f7ff6 100644
--- a/GUI/View/Intensity/PlotConstants.h
+++ b/GUI/View/Intensity/PlotConstants.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INTENSITY_PLOTCONSTANTS_H
#define BORNAGAIN_GUI_VIEW_INTENSITY_PLOTCONSTANTS_H
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QSize>
namespace GUI::Constants {
diff --git a/GUI/View/Intensity/ScientificPlot.h b/GUI/View/Intensity/ScientificPlot.h
index c37d282f922..563f7da5dd8 100644
--- a/GUI/View/Intensity/ScientificPlot.h
+++ b/GUI/View/Intensity/ScientificPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INTENSITY_SCIENTIFICPLOT_H
#define BORNAGAIN_GUI_VIEW_INTENSITY_SCIENTIFICPLOT_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <memory>
class PlotEventInfo;
diff --git a/GUI/View/Intensity/StatusLabel.cpp b/GUI/View/Intensity/StatusLabel.cpp
index abc0023c438..0081ce72afa 100644
--- a/GUI/View/Intensity/StatusLabel.cpp
+++ b/GUI/View/Intensity/StatusLabel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Intensity/StatusLabel.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/View/Job/FitComparisonWidget.h b/GUI/View/Job/FitComparisonWidget.h
index 1e56db1f1e6..ad6a65033a4 100644
--- a/GUI/View/Job/FitComparisonWidget.h
+++ b/GUI/View/Job/FitComparisonWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_FITCOMPARISONWIDGET_H
#define BORNAGAIN_GUI_VIEW_JOB_FITCOMPARISONWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <QMap>
class JobItem;
diff --git a/GUI/View/Job/FitComparisonWidget1D.h b/GUI/View/Job/FitComparisonWidget1D.h
index b8cc478322e..3b021ffec25 100644
--- a/GUI/View/Job/FitComparisonWidget1D.h
+++ b/GUI/View/Job/FitComparisonWidget1D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_FITCOMPARISONWIDGET1D_H
#define BORNAGAIN_GUI_VIEW_JOB_FITCOMPARISONWIDGET1D_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class Data1DViewItem;
class FitComparison1DViewController;
diff --git a/GUI/View/Job/FitFlowWidget.h b/GUI/View/Job/FitFlowWidget.h
index c8e687e35f6..adb36f80f5d 100644
--- a/GUI/View/Job/FitFlowWidget.h
+++ b/GUI/View/Job/FitFlowWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_FITFLOWWIDGET_H
#define BORNAGAIN_GUI_VIEW_JOB_FITFLOWWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class HistogramPlot;
class FitSuiteItem;
diff --git a/GUI/View/Job/JobListView.cpp b/GUI/View/Job/JobListView.cpp
index fd19327620c..f6f3c797b10 100644
--- a/GUI/View/Job/JobListView.cpp
+++ b/GUI/View/Job/JobListView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Job/JobListModel.h"
#include "GUI/View/Job/JobListViewDelegate.h"
-#include "GUI/Widget/Common/StyledToolBar.h"
#include <QAction>
#include <QListView>
#include <QMenu>
diff --git a/GUI/View/Job/JobMessagePanel.h b/GUI/View/Job/JobMessagePanel.h
index b38053d907a..fa16ecda633 100644
--- a/GUI/View/Job/JobMessagePanel.h
+++ b/GUI/View/Job/JobMessagePanel.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBMESSAGEPANEL_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBMESSAGEPANEL_H
+#include "GUI/View/Common/InfoPanel.h"
#include "GUI/View/FitWidgets/FitLog.h"
-#include "GUI/Widget/Common/InfoPanel.h"
#include <QColor>
class QTextEdit;
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index ed70bceed04..e0555271737 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/Job/JobPropertiesTableModel.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/View/Job/JobResultsPresenter.h b/GUI/View/Job/JobResultsPresenter.h
index 8d73d5f1966..f4b61a95c72 100644
--- a/GUI/View/Job/JobResultsPresenter.h
+++ b/GUI/View/Job/JobResultsPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
-#include "GUI/Widget/Common/ItemComboWidget.h"
+#include "GUI/View/Common/ItemComboWidget.h"
class InstrumentItem;
class JobItem;
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index bb03651f175..cbbf2753c3c 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -15,6 +15,7 @@
#include "GUI/View/Job/JobView.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
+#include "GUI/View/Common/DocksController.h"
#include "GUI/View/FitWidgets/FitActivityPanel.h"
#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
#include "GUI/View/Job/JobMessagePanel.h"
@@ -24,7 +25,6 @@
#include "GUI/View/Job/JobViewActivities.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
-#include "GUI/Widget/Common/DocksController.h"
#include <QMenu>
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 53bac14c02a..369ad774eb7 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/Util/Path.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QDate>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/View/Main/AutosaveController.cpp b/GUI/View/Main/AutosaveController.cpp
index ba5877b4eeb..7e3b42d72c8 100644
--- a/GUI/View/Main/AutosaveController.cpp
+++ b/GUI/View/Main/AutosaveController.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Main/AutosaveController.h"
#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Widget/Common/UpdateTimer.h"
+#include "GUI/View/Tool/UpdateTimer.h"
#include <QDir>
namespace {
diff --git a/GUI/View/Main/MainWindow.h b/GUI/View/Main/MainWindow.h
index f356f77d160..0b725d68797 100644
--- a/GUI/View/Main/MainWindow.h
+++ b/GUI/View/Main/MainWindow.h
@@ -17,25 +17,24 @@
#include <QMainWindow>
-class WelcomeView;
-class InstrumentView;
-class SampleView;
+class ActionManager;
class ImportDataView;
-class SimulationView;
+class InstrumentView;
class JobView;
-class SessionModelView;
-
class ProjectManager;
-class ActionManager;
+class ProjectSettingsView;
+class SampleView;
+class SessionModelView;
+class SimulationView;
class UpdateNotifier;
+class WelcomeView;
-class QProgressBar;
class QButtonGroup;
+class QProgressBar;
class QStackedLayout;
class QStatusBar;
class QToolButton;
class QVBoxLayout;
-class ProjectSettingsView;
class MainWindow : public QMainWindow {
Q_OBJECT
diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp
index 0123cde5a81..e0b06c66b19 100644
--- a/GUI/View/Main/ProjectManager.cpp
+++ b/GUI/View/Main/ProjectManager.cpp
@@ -22,11 +22,11 @@
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Info/ProjectLoadProblemDialog.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/NewProjectDialog.h"
#include "GUI/View/Main/SaveService.h"
#include "GUI/View/Tool/MessageBox.h"
-#include "GUI/View/Info/ProjectLoadProblemDialog.h"
#include <QApplication>
#include <QDateTime>
#include <QFileDialog>
diff --git a/GUI/View/Main/PyImportAssistant.cpp b/GUI/View/Main/PyImportAssistant.cpp
index 7fe0c4e98be..bda14ce477b 100644
--- a/GUI/View/Main/PyImportAssistant.cpp
+++ b/GUI/View/Main/PyImportAssistant.cpp
@@ -24,10 +24,10 @@
#include "GUI/Model/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Util/Path.h"
#include "GUI/Util/String.h"
-#include "GUI/View/Main/ProjectManager.h"
-#include "GUI/View/Tool/MessageBox.h"
#include "GUI/View/Info/ComboSelectorDialog.h"
#include "GUI/View/Info/DetailedMessageBox.h"
+#include "GUI/View/Main/ProjectManager.h"
+#include "GUI/View/Tool/MessageBox.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
#include <QApplication>
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index c5b11529004..7f3254c7a19 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -26,7 +26,7 @@
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/View/Tool/EditUtil.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include "ui_MaterialEditorDialog.h"
#include <QAction>
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.h b/GUI/View/Projection/IntensityDataProjectionsWidget.h
index 7efe9a4c35a..a3f8bcccf0c 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.h
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class ProjectionsEditor;
class IntensityDataItem;
diff --git a/GUI/View/Projection/ProjectionsPlot.h b/GUI/View/Projection/ProjectionsPlot.h
index 4df4a4d214a..49bf7e124b9 100644
--- a/GUI/View/Projection/ProjectionsPlot.h
+++ b/GUI/View/Projection/ProjectionsPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPLOT_H
#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPLOT_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <QMap>
#include <memory>
#include <qcustomplot.h>
diff --git a/GUI/View/Projection/ProjectionsPropertyPanel.h b/GUI/View/Projection/ProjectionsPropertyPanel.h
index f957d66a4cb..e2afd585203 100644
--- a/GUI/View/Projection/ProjectionsPropertyPanel.h
+++ b/GUI/View/Projection/ProjectionsPropertyPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPROPERTYPANEL_H
#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPROPERTYPANEL_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class ComponentEditor;
diff --git a/GUI/View/Projection/ProjectionsWidget.h b/GUI/View/Projection/ProjectionsWidget.h
index f47b53fd074..02edf0d30ad 100644
--- a/GUI/View/Projection/ProjectionsWidget.h
+++ b/GUI/View/Projection/ProjectionsWidget.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
+#include "GUI/View/Common/SessionItemWidget.h"
#include "GUI/View/Mask/MaskEditorFlags.h"
-#include "GUI/Widget/Common/SessionItemWidget.h"
class ProjectionsPlot;
class QTabWidget;
diff --git a/GUI/View/PropertyEditor/ComponentTreeView.cpp b/GUI/View/PropertyEditor/ComponentTreeView.cpp
index fa02d851227..5d0b01058ef 100644
--- a/GUI/View/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/View/PropertyEditor/ComponentTreeView.cpp
@@ -18,7 +18,7 @@
#include "GUI/View/PropertyEditor/ComponentTreeActions.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QBoxLayout>
#include <QStandardItemModel>
#include <QTreeView>
diff --git a/GUI/View/PropertyEditor/CustomEditors.cpp b/GUI/View/PropertyEditor/CustomEditors.cpp
index 8f72b4812c0..56b75b0f936 100644
--- a/GUI/View/PropertyEditor/CustomEditors.cpp
+++ b/GUI/View/PropertyEditor/CustomEditors.cpp
@@ -19,9 +19,9 @@
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ComboProperty.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
-#include "GUI/Widget/Common/ScientificSpinBox.h"
#include <QApplication>
#include <QBoxLayout>
#include <QCheckBox>
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
index b46d447f1c9..9f680d9e7f7 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
@@ -18,8 +18,8 @@
#include "GUI/Model/Session/SessionFlags.h"
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Util/ComboProperty.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
#include "GUI/View/PropertyEditor/MultiComboPropertyEditor.h"
-#include "GUI/Widget/Common/ScientificSpinBox.h"
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
diff --git a/GUI/View/PropertyEditor/TestComponentView.cpp b/GUI/View/PropertyEditor/TestComponentView.cpp
index 694cc446170..0bcbf73f4ff 100644
--- a/GUI/View/PropertyEditor/TestComponentView.cpp
+++ b/GUI/View/PropertyEditor/TestComponentView.cpp
@@ -23,7 +23,7 @@
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/View/PropertyEditor/ComponentEditor.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/ExemplarySamples.h"
#include <QBoxLayout>
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp
index 4f139c8266a..675defc02f4 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -17,11 +17,11 @@
#include "GUI/Model/Group/FilterPropertyProxy.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Session/SessionItemUtils.h"
+#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/View/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/View/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/View/RealSpaceWidgets/RealSpaceView.h"
-#include "GUI/View/Info/CautionSign.h"
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
index 7de4e9b9c43..8018bc2e566 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
class QToolButton;
class QCheckBox;
diff --git a/GUI/View/SampleDesigner/ConnectableView.cpp b/GUI/View/SampleDesigner/ConnectableView.cpp
index c0805b54fce..c4516764c6c 100644
--- a/GUI/View/SampleDesigner/ConnectableView.cpp
+++ b/GUI/View/SampleDesigner/ConnectableView.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Session/SessionGraphicsItem.h"
#include "GUI/Util/Error.h"
#include "GUI/View/SampleDesigner/NodeEditorConnection.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/SampleDesigner/DesignerMimeData.cpp b/GUI/View/SampleDesigner/DesignerMimeData.cpp
index 28192d1b3ab..4b90e87bc44 100644
--- a/GUI/View/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/View/SampleDesigner/DesignerMimeData.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/DesignerMimeData.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QDrag>
#include <QPixmap>
#include <QWidget>
diff --git a/GUI/View/SampleDesigner/DesignerScene.cpp b/GUI/View/SampleDesigner/DesignerScene.cpp
index ea8896b0b35..1eb97b2a88f 100644
--- a/GUI/View/SampleDesigner/DesignerScene.cpp
+++ b/GUI/View/SampleDesigner/DesignerScene.cpp
@@ -32,7 +32,7 @@
#include "GUI/View/SampleDesigner/NodeEditorConnection.h"
#include "GUI/View/SampleDesigner/SampleViewAligner.h"
#include "GUI/View/SampleDesigner/SampleViewFactory.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/View/SampleDesigner/ILayerView.cpp b/GUI/View/SampleDesigner/ILayerView.cpp
index 918779e822b..a5d5ebb408d 100644
--- a/GUI/View/SampleDesigner/ILayerView.cpp
+++ b/GUI/View/SampleDesigner/ILayerView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Util/Error.h"
#include "GUI/View/SampleDesigner/DesignerScene.h"
#include "GUI/View/SampleDesigner/MultiLayerView.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QGraphicsSceneMouseEvent>
QLineF MultiLayerCandidate::getInterfaceToScene()
diff --git a/GUI/View/SampleDesigner/InterferenceViews.cpp b/GUI/View/SampleDesigner/InterferenceViews.cpp
index 6b59037ccdb..4d3c3e767b5 100644
--- a/GUI/View/SampleDesigner/InterferenceViews.cpp
+++ b/GUI/View/SampleDesigner/InterferenceViews.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/InterferenceViews.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
Interference1DLatticeView::Interference1DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 655f3eb1d55..10642c3b836 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/SampleDesigner/LayerOrientedSampleEditor.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
-#include "GUI/Widget/Common/StyledToolBar.h"
#include "GUI/Application/GlobalSettings.h"
#include <QBoxLayout>
diff --git a/GUI/View/SampleDesigner/LayerView.cpp b/GUI/View/SampleDesigner/LayerView.cpp
index c01d06f2732..abda5606898 100644
--- a/GUI/View/SampleDesigner/LayerView.cpp
+++ b/GUI/View/SampleDesigner/LayerView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/View/SampleDesigner/MultiLayerView.h"
#include "GUI/View/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/SampleDesigner/MesoCrystalView.cpp b/GUI/View/SampleDesigner/MesoCrystalView.cpp
index fc71f539c35..01022b59b32 100644
--- a/GUI/View/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/View/SampleDesigner/MesoCrystalView.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/SampleDesigner/MesoCrystalView.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/View/SampleDesigner/MultiLayerView.cpp b/GUI/View/SampleDesigner/MultiLayerView.cpp
index 67ee9e56008..a68664bc145 100644
--- a/GUI/View/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/View/SampleDesigner/MultiLayerView.cpp
@@ -18,7 +18,7 @@
#include "GUI/View/SampleDesigner/DesignerMimeData.h"
#include "GUI/View/SampleDesigner/DesignerScene.h"
#include "GUI/View/SampleDesigner/LayerView.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/SampleDesigner/NodeEditorPort.cpp b/GUI/View/SampleDesigner/NodeEditorPort.cpp
index 4450a2c6164..7d238f7022a 100644
--- a/GUI/View/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/View/SampleDesigner/NodeEditorPort.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/SampleDesigner/NodeEditorPort.h"
#include "GUI/View/SampleDesigner/NodeEditorConnection.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QGraphicsScene>
#include <QPainter>
#include <QPen>
diff --git a/GUI/View/SampleDesigner/ParticleCompositionView.cpp b/GUI/View/SampleDesigner/ParticleCompositionView.cpp
index 7424edf2621..4c24808c686 100644
--- a/GUI/View/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/View/SampleDesigner/ParticleCompositionView.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/SampleDesigner/ParticleCompositionView.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellView.cpp b/GUI/View/SampleDesigner/ParticleCoreShellView.cpp
index 2036f1764ff..6af0950071f 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/View/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/SampleDesigner/ParticleCoreShellView.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/View/SampleDesigner/ParticleLayoutView.cpp b/GUI/View/SampleDesigner/ParticleLayoutView.cpp
index e76bc18b5e9..cd5eb8c0442 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Util/Error.h"
#include "GUI/View/SampleDesigner/ParticleView.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/View/SampleDesigner/ParticleView.cpp b/GUI/View/SampleDesigner/ParticleView.cpp
index 7f5a2630fca..f371833ebd1 100644
--- a/GUI/View/SampleDesigner/ParticleView.cpp
+++ b/GUI/View/SampleDesigner/ParticleView.cpp
@@ -17,8 +17,8 @@
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index c5ee023ee6e..8cbb43df354 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Model/Sample/SampleListModel.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ItemDelegateForHTML.h"
-#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
+#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include <QAction>
#include <QDialog>
#include <QDialogButtonBox>
diff --git a/GUI/View/SampleDesigner/SampleToolBar.h b/GUI/View/SampleDesigner/SampleToolBar.h
index 5746da83e52..1b77f74b6ea 100644
--- a/GUI/View/SampleDesigner/SampleToolBar.h
+++ b/GUI/View/SampleDesigner/SampleToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include <QTreeView>
class QAction;
diff --git a/GUI/View/SampleDesigner/SampleViewAligner.cpp b/GUI/View/SampleDesigner/SampleViewAligner.cpp
index 3234acb85b7..46f04c1b11b 100644
--- a/GUI/View/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/View/SampleDesigner/SampleViewAligner.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/View/SampleDesigner/DesignerScene.h"
#include "GUI/View/SampleDesigner/IView.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QModelIndex>
namespace {
diff --git a/GUI/View/SampleDesigner/ScriptPanel.cpp b/GUI/View/SampleDesigner/ScriptPanel.cpp
index a7739dfb504..92c390ed83d 100644
--- a/GUI/View/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/View/SampleDesigner/ScriptPanel.cpp
@@ -17,10 +17,10 @@
#include "GUI/Model/Domain/DomainObjectBuilder.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/UpdateTimer.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Info/PythonSyntaxHighlighter.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/UpdateTimer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include <QScrollBar>
diff --git a/GUI/View/SampleDesigner/ScriptPanel.h b/GUI/View/SampleDesigner/ScriptPanel.h
index 0b3c5ed87cb..77ce96f4026 100644
--- a/GUI/View/SampleDesigner/ScriptPanel.h
+++ b/GUI/View/SampleDesigner/ScriptPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H
-#include "GUI/Widget/Common/InfoPanel.h"
+#include "GUI/View/Common/InfoPanel.h"
class SampleModel;
class PythonSyntaxHighlighter;
diff --git a/GUI/View/SampleDesigner/TransformationView.cpp b/GUI/View/SampleDesigner/TransformationView.cpp
index d1991c018fa..75ce9f047e5 100644
--- a/GUI/View/SampleDesigner/TransformationView.cpp
+++ b/GUI/View/SampleDesigner/TransformationView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/TransformationView.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
TransformationView::TransformationView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/View/Script/PythonScriptWidget.cpp b/GUI/View/Script/PythonScriptWidget.cpp
index b55a6c3594e..30cd453f320 100644
--- a/GUI/View/Script/PythonScriptWidget.cpp
+++ b/GUI/View/Script/PythonScriptWidget.cpp
@@ -17,11 +17,11 @@
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Domain/DomainSimulationBuilder.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Widget/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Info/PythonSyntaxHighlighter.h"
+#include "GUI/View/Tool/DesignerHelper.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/View/SpecularDataWidgets/Plot1DCanvas.h b/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
index b9adb5bc00c..92f1f0c937b 100644
--- a/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
index c647e45efa4..5ab7e5499fd 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <QWidget>
class SpecularDataItem;
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
index 6eb36c642fa..8d0f102ebd2 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#include "GUI/Model/IO/AbstractDataLoader1D.h"
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include "qcustomplot.h"
#include <memory>
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui
index ed1af998959..0e975b3d177 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui
+++ b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui
@@ -300,7 +300,7 @@
<customwidget>
<class>StyledToolBar</class>
<extends>QWidget</extends>
- <header>GUI/Widget/Common/StyledToolBar.h</header>
+ <header>GUI/View/Common/StyledToolBar.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataWidget.h b/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
index 26f20938f0d..d797068f1f2 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class SpecularDataCanvas;
class SpecularDataItem;
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlot.cpp b/GUI/View/SpecularDataWidgets/SpecularPlot.cpp
index fe00d9d7ea2..72f02d28afa 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/View/SpecularDataWidgets/SpecularPlot.cpp
@@ -18,7 +18,7 @@
#include "GUI/View/Intensity/ColorMapUtils.h"
#include "GUI/View/Intensity/PlotConstants.h"
#include "GUI/View/Intensity/PlotEventInfo.h"
-#include "GUI/Widget/Common/UpdateTimer.h"
+#include "GUI/View/Tool/UpdateTimer.h"
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
index 316ea500c54..a05f94346b7 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
-#include "GUI/Widget/Common/SessionItemWidget.h"
+#include "GUI/View/Common/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Widget/Common/DesignerHelper.cpp b/GUI/View/Tool/DesignerHelper.cpp
similarity index 98%
rename from GUI/Widget/Common/DesignerHelper.cpp
rename to GUI/View/Tool/DesignerHelper.cpp
index 203ec9b295c..9d299b3fce8 100644
--- a/GUI/Widget/Common/DesignerHelper.cpp
+++ b/GUI/View/Tool/DesignerHelper.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/DesignerHelper.cpp
+//! @file GUI/View/Tool/DesignerHelper.cpp
//! @brief Implements class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include "GUI/Model/Material/MaterialItemUtils.h"
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include <QPainter>
#include <cmath>
#include <iostream>
diff --git a/GUI/Widget/Common/DesignerHelper.h b/GUI/View/Tool/DesignerHelper.h
similarity index 92%
rename from GUI/Widget/Common/DesignerHelper.h
rename to GUI/View/Tool/DesignerHelper.h
index 30f0de4d306..6348e46e748 100644
--- a/GUI/Widget/Common/DesignerHelper.h
+++ b/GUI/View/Tool/DesignerHelper.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/DesignerHelper.h
+//! @file GUI/View/Tool/DesignerHelper.h
//! @brief Defines class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DESIGNERHELPER_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_DESIGNERHELPER_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_DESIGNERHELPER_H
+#define BORNAGAIN_GUI_VIEW_TOOL_DESIGNERHELPER_H
#include <QColor>
#include <QGradient>
@@ -75,4 +75,4 @@ public:
static int getPythonEditorFontSize();
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_DESIGNERHELPER_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_DESIGNERHELPER_H
diff --git a/GUI/Widget/Common/StyleUtils.cpp b/GUI/View/Tool/StyleUtils.cpp
similarity index 96%
rename from GUI/Widget/Common/StyleUtils.cpp
rename to GUI/View/Tool/StyleUtils.cpp
index a9c7d75c0ff..5d4d1b9132d 100644
--- a/GUI/Widget/Common/StyleUtils.cpp
+++ b/GUI/View/Tool/StyleUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/StyleUtils.cpp
+//! @file GUI/View/Tool/StyleUtils.cpp
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/StyleUtils.h"
+#include "GUI/View/Tool/StyleUtils.h"
#include "Base/Utils/Assert.h"
#include "GUI/Util/OSInfo.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
+#include "GUI/View/Tool/DesignerHelper.h"
#include <QApplication>
#include <QBoxLayout>
#include <QDialog>
diff --git a/GUI/Widget/Common/StyleUtils.h b/GUI/View/Tool/StyleUtils.h
similarity index 87%
rename from GUI/Widget/Common/StyleUtils.h
rename to GUI/View/Tool/StyleUtils.h
index c1135d4a326..d89ff918439 100644
--- a/GUI/Widget/Common/StyleUtils.h
+++ b/GUI/View/Tool/StyleUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/StyleUtils.h
+//! @file GUI/View/Tool/StyleUtils.h
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_STYLEUTILS_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_STYLEUTILS_H
+#define BORNAGAIN_GUI_VIEW_TOOL_STYLEUTILS_H
#include <QFont>
#include <QString>
@@ -52,4 +52,4 @@ int PropertyPanelWidth();
} // namespace GUI::Util::Style
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_STYLEUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_STYLEUTILS_H
diff --git a/GUI/Widget/Common/UpdateTimer.cpp b/GUI/View/Tool/UpdateTimer.cpp
similarity index 94%
rename from GUI/Widget/Common/UpdateTimer.cpp
rename to GUI/View/Tool/UpdateTimer.cpp
index 57692004a07..36736684456 100644
--- a/GUI/Widget/Common/UpdateTimer.cpp
+++ b/GUI/View/Tool/UpdateTimer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/UpdateTimer.cpp
+//! @file GUI/View/Tool/UpdateTimer.cpp
//! @brief Implements class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Widget/Common/UpdateTimer.h"
+#include "GUI/View/Tool/UpdateTimer.h"
#include <QTimer>
UpdateTimer::UpdateTimer(int timerInterval, QObject* parent)
diff --git a/GUI/Widget/Common/UpdateTimer.h b/GUI/View/Tool/UpdateTimer.h
similarity index 86%
rename from GUI/Widget/Common/UpdateTimer.h
rename to GUI/View/Tool/UpdateTimer.h
index f2d14934f17..55a8ee6383e 100644
--- a/GUI/Widget/Common/UpdateTimer.h
+++ b/GUI/View/Tool/UpdateTimer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Widget/Common/UpdateTimer.h
+//! @file GUI/View/Tool/UpdateTimer.h
//! @brief Defines class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGET_COMMON_UPDATETIMER_H
-#define BORNAGAIN_GUI_WIDGET_COMMON_UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_UPDATETIMER_H
+#define BORNAGAIN_GUI_VIEW_TOOL_UPDATETIMER_H
#include <QObject>
@@ -49,4 +49,4 @@ private:
QTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_WIDGET_COMMON_UPDATETIMER_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_UPDATETIMER_H
diff --git a/GUI/View/Toplevel/ImportDataView.h b/GUI/View/Toplevel/ImportDataView.h
index c43f5a9a2b5..7f10ccea8b1 100644
--- a/GUI/View/Toplevel/ImportDataView.h
+++ b/GUI/View/Toplevel/ImportDataView.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
#define BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
+#include "GUI/View/Common/ItemStackPresenter.h"
#include "GUI/View/Import/RealDataPresenter.h"
-#include "GUI/Widget/Common/ItemStackPresenter.h"
class RealDataModel;
class RealDataSelectorWidget;
diff --git a/GUI/View/Toplevel/SampleView.cpp b/GUI/View/Toplevel/SampleView.cpp
index 9faf3a6e375..449b10f48ae 100644
--- a/GUI/View/Toplevel/SampleView.cpp
+++ b/GUI/View/Toplevel/SampleView.cpp
@@ -16,6 +16,7 @@
#include "GUI/Model/Group/FilterPropertyProxy.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/View/Common/DocksController.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/SampleDesigner/DesignerScene.h"
#include "GUI/View/SampleDesigner/DesignerView.h"
@@ -27,7 +28,6 @@
#include "GUI/View/SampleDesigner/SampleToolBox.h"
#include "GUI/View/SampleDesigner/SampleTreeWidget.h"
#include "GUI/View/SampleDesigner/ScriptPanel.h"
-#include "GUI/Widget/Common/DocksController.h"
#include <QBoxLayout>
#include <QDockWidget>
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index 357b561e362..313cbb50c89 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -18,11 +18,11 @@
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Sample/SampleModel.h"
+#include "GUI/View/Common/ModelTreeView.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/View/Toplevel/TestView.h"
-#include "GUI/Widget/Common/ModelTreeView.h"
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
index 4386bd73856..c2ad3e8b846 100644
--- a/Tests/Unit/GUI/TestScientificSpinBox.cpp
+++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Widget/Common/ScientificSpinBox.h"
+#include "GUI/View/Common/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 0ed73faa7bf..3bfae4e13f2 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -1,6 +1,6 @@
#include "GUI/Model/Data/AxesItems.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Widget/Common/SessionItemController.h"
+#include "GUI/View/Common/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 d6deebcf57b..bb72b8e3890 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/Model/Session/SessionItem.h"
-#include "GUI/Widget/Common/SessionItemController.h"
+#include "GUI/View/Common/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 33af72d0b95..3d5ce6d7804 100644
--- a/Tests/Unit/GUI/TestUpdateTimer.cpp
+++ b/Tests/Unit/GUI/TestUpdateTimer.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Widget/Common/UpdateTimer.h"
+#include "GUI/View/Tool/UpdateTimer.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
--
GitLab