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 e6af5d1e2ef1354072f5836de3b956b8325098ef..1c6ecc62c5bd592a16b892d7004e1f5c6ec1966e 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 6f1cca86861dc0f04cdd34bc1f627f86119d8b29..e734e979e1c4d77baaac3f588270b9fd687a39ce 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 5ecb64ba7350b87b6e5ff9172d37009c9b69d358..c53abb217f437720776ad42b94e5122951e1bc0d 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 85342fe351c9613992542b511f408a576346fd89..28504494f7463b2a1795155bde087bc5259bec67 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 b97a116b0c75ac4b2cb8c8b5aa679a7c621fb6b8..5790e46b9c4084aee67494f7cb8f0ef1d364d334 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 215e22a860fd6752d367948edc69d9a45ab739ab..c9d4f583e2cc03cbd8e2d194ba7737e85f405644 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 650eb790f1e5756ed9d6be51b87a64cc50a7c3c4..af1aa5997f6f16d138af0800b9dbebb4227d76c5 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 ea97e276cdafa9f01ee95df17217078c929da5ab..c12e7acd24e884e1a469f0e903cbbd21d182eb9b 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 b7f4cfc830ecf1aeaae8dec1e050f1de5356fa64..555b2f43f468eaf12dbe9446b9e1bc027dc8b360 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 bcc5082f7b7a15381bc73501f75350957475aab4..25b4fdd072c3e30ce174cbeaf8bf655a05fe7163 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 36521ccfe3fdddd54c6d5f5b26404405e16dc487..db71d612bf1d9c24456bfb14b9563539a3d5f4da 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 cbe459ff522eed097074484e171e9764f45f89a6..26e4601395b2c33413b1067c29317573e7ff13bb 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 a9afa4fa3608e2ac64e60d1cebda5090f8f09cb5..a9bd7a3ea44f0bc05ad0ddff9fc8a6303a65c62c 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 b44245932a167fec2d1e7f71458be0f0a950d216..492bf86a7fb9fef289e885dc8db9d339f35150ec 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 4760091a8075a5bd2aa2589bc32605569ee71f26..bd11b248894c72b1df6d09a24948eb5eb65ec7e2 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 c25cc4d3865a182e1873f490b7f0c7135bb8864f..07a1165ea563fc998a82d38dd194b24e04040708 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 575477bf10a33c549785e2f8d63d693c8d405f43..a1d1ce780fc3d772fa1f42d451819abf21eab9cd 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 4d7aca0bc9d7cc4493930334a4e6d5d69a114af3..08a8c5f1ada8a14b1fb95349d70754a247908791 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 1f7e5c3b14ce1356bf28285c059c15cc2309852d..996d489c031ce1820cf8c77340fce2f36c93ff93 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 2d7e77f5d152830b40b3a7c68b155f9324890124..7af84cdfa246faed8d8df0f930d5f445ac15935a 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 e158e2cbf86c6542b6ceb5d6381fdd2e6409ebcf..a10255fe68b5ae2c16bb5a4e8b98ebdcf36f1ee2 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 2f935c1ca6c96ef70d8a47e05d97be14819bc395..9dc56aa24b7238e4ffa1cd216408fd80722f32e8 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 9e47cafeb1aa994773bc7802a07386a31f86d6a4..8f635afc1651b32a10efb7208cf18e2093e54985 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 51e943165e5a0eb4190fb48e3c45d09ae8d06cda..0e0d20a00d88e7c0ae39c874ee609740ef25c70c 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 dffb2d6c4e82e6939d3696ed4e9f7648ed87ff87..98339e43514c07c6ee42db7a130c4f1fd11fc2fc 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 07708b77f3b81613ff67ee96680dbd2e61b2e53b..825066d3af79f2f853de10b59b611cd793f21ae4 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 b7ecebcb3b8858a4ab4cc96ed70671de2689bf97..368f8d9fae486bc4e414488f54bbdce9ea501f1b 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 bb884be6324d3f991490416c98d0cd852c6fbd5b..a6dc5d2a6b2d108bc0f1a0882982f780d4b344de 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 9ead147c741cadef014f8af16876e19a10d2abed..d207b8a79344e0ff9fb84a0de61345303bf3059a 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 538e55b71d71ab82a29385c28883abcd0d570596..c0ffd707fa2f89fd4d8635246238a65ee6b20c6c 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 20ad611deeb938948009408732c0c4012ab03fd9..d1f54346b167cb44f952d0983f985d50a6b0a1dd 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 c263cf2c3ad79522e8902ab58d930116c1b4aeef..4fc8cd81d4f272a170b4ccc709723fab9f6f0d91 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 40f89c479139c452739ffe6a1b1bc12442b3ce72..98c2d288fef017742d55d7fcd784dd943a939780 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 dd5b0a066b71fc73ed910a43e70001e17c2bdb4a..1c9533713e6df0644bc037cfa1d5baa134117f42 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 a0d9dfa71bf6dabb933953c2e656bffd19c2c323..999bfa89b8bc29ee757149a719862f9a1bb64771 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 9e98e4fb6caa893c6f1855f19d0a9a5893facfe7..6b65619b5a47ff33b19ccee6d3a291247db472ca 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 efa08d14c0ce4379ea76d8838451e2dfc5bea2d1..1fef84cfabf214e7753c210630c4f57e60469503 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 3fe698f19aa5a6143386110b6cbfc4bcb1028728..8837db5715d68037633591740b7395fd38ecd0e4 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 e0a2415530a074216030eb3d16fc76ce66492e44..d977faa27b4bd0b00c1fa38625babd51cf9fdbcd 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 0c7c03746ebcb244b835791182a5a791ffdb027f..849e3418cab911856fb171af1dfdca1488f961cf 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 faf0aca86e5d1b8e584f2259305f89b8c4fc9249..997c876c4d58b590636d6cb6835c0bc0a81a2e7b 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 eca9332ec87e5d5bd6ad0f78ef7c8adf5303fdcc..01b2f1bfd2e88a4dc62a3045442a99ef0ae695bc 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 6e8c76651c9a443443c84d245a9fe2281468e667..ba829d23b0c2013adce99b1257c8976604559abf 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 6c0649badcfc2640e647dacc77077d2f72b59d12..3a9ac22cbc5c7f4822368b0c8a0ffc05bbb883e1 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 134653d3b22359813a5ac274228f0cca40669d77..ec718d8e2c174ba87c7965c900cd87f422ae862a 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 5c0ee097675d0a73c791a8304bac0bc317571869..9dfe0dd4d3d3a5607aed6652f6f0bdd98a67b401 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 99292caaf764b4f2acfee477107fef3c3749002a..dab35001d2dc472f8a70eb3080cc29f80b96c834 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 e86c98b9e1e80299de5f99e9aaa7ce75e3a66e50..6f0ba2cf1e466d410cf1c3850160fb0570fb54fd 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 0bb7bcc68909126dc4888ed4d4c30d8985228895..c299eaf74746f4b90d58af4042e525681135ed36 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 bbca7387b4cb37d76ea48354603b0466d75c9652..cf0d75284b3fa99681bcecdaabfdb9b2bba45060 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 76c6c26ec95d5ae3e9e3574ab665568339c258da..43984ad09126c53a43c5e3413039c4af7ed0f33e 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 8ed3d86bf4c816fa6dcdb065a046f883ba355a55..c81db3b8ed29902088f802bb42534041e67a2fa1 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 a1045dd30410a7baf207f98013e132138154ba60..2c18c928607aabe803dbb98d7212f5c3824ae3d7 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 7871d7b456e79da52b6403d7b3b89fa55769af35..383632f7ff66f30217c8eee2c9efdc1da0ae7f0d 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 c37d282f922753ee7a8f5cf4bc2541da0813b8b1..563f7da5dd864e9f32ba4317a500904a12aacc81 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 abc0023c438d029c36e75bc173c9a3f02eaedc0f..0081ce72afa708c989a09c181a587d15a9b1db45 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 1e56db1f1e63173cf57473698443e5efe4e453bf..ad6a65033a4b62b72716bda21af3a0faae63a3a8 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 b8cc478322e331e55d0200f61b1b1aa61a94607c..3b021ffec2532ba846d2020b3642c08ebf40d6f7 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 c8e687e35f62feed31b9f5f58134fe48daacc310..adb36f80f5de3dccbd9ec17593471eca74af6ff1 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 fd19327620c306d3f324037f5d70a7790aafd5c3..f6f3c797b1023eceee95857713d5606591550880 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 b38053d907afec3b8460ed7d0b0049fa614df90f..fa16ecda63396742a60d6f8324509bb59e2f046d 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 ed70bceed0436fa3af0953b21452f4423257f077..e0555271737601a75033e675826781641831c59a 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 8d73d5f1966c2968bb37983874006b075540f697..f4b61a95c72fb6277009095534214e18fd14627b 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 bb03651f17535219e7e047f1e444fc4e0e20c136..cbbf2753c3c862836acb1dbe307104185a0a5a14 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 53bac14c02acfba29431f9a362d667c2a3bd458a..369ad774eb77ed21c4bbca862944c302f0d3d5ec 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 ba5877b4eeb626bfe53440345419d289e53ebb88..7e3b42d72c805d4fce57d98514755564a95b60f0 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 f356f77d160d4787cc5d7875ca2ba590064aed1e..0b725d68797107176fc785bafb7c78f6071c990f 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 0123cde5a8175801cda26cadc4cc2b94c539a401..e0b06c66b19b24b75ac4ac021c26f05775c7d806 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 7fe0c4e98be8332b1ef6f186359f649216a5fb4a..bda14ce477b94f0109875daf412171d8983c2942 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 c5b115290041be2a6ecccea0ddd6c80756520ad6..7f3254c7a191cdbc9b6bb5e6412d1c3c8717105e 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 7efe9a4c35a8c4a50c0ff3d55950a96b476e78af..a3f8bcccf0c1a0145966bef20d0c2b8253ced6d9 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 4df4a4d214a6eafa2dfabb1485afc09acef3201b..49bf7e124b980327326f9fa0230bb3740cddee43 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 f957d66a4cbf3949bb61f074c3ccb007f01ff255..e2afd58520355953a62be814aeb3eadcbe964909 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 f47b53fd074dfa6e66ff2b04cd17e7b4b0b4e9ed..02edf0d30ad93d18df2bfa5ec90f51993c183d67 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 fa02d851227aaacda22490e8a3dcf43902cae2e5..5d0b01058efcb973f70bfeaf75ab04a738ed3bab 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 8f72b4812c0d1cd4fd9a40c079029f10301ca47c..56b75b0f9363cf62254ecbf9319b6502ea03f8b5 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 b46d447f1c9dd1a705825150880520a730c3f941..9f680d9e7f7902e240c439bf1ed9ff464fb6736f 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 694cc4461701b7ad343d43f53e0594919deff23d..0bcbf73f4ff9785d4b5cd3db676918ff25ffed2e 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 4f139c8266a437e5c3791298d9fee1e5fd3d96e8..675defc02f4196dd48d5f5171138857963bef088 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 7de4e9b9c436e6f1b7c9ffb6a9f7aa4765199cbe..8018bc2e566981d7b97855ff8a5cef62a2a0bdcd 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 c0805b54fce3e5efddac1720fec5b2022f4b3b2a..c4516764c6c362771917bd8735f4d95ab07a740c 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 28192d1b3ab78eaf819a639743e4177d3fd5fc76..4b90e87bc44423cbfc32f1dd54051d177ee56d7d 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 ea8896b0b3586e8792cfb3f0953709c53a06472d..1eb97b2a88f5e9505bf2e37f1ef43a6e5b8f4e93 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 918779e822bdf4f9001944c5f59a451de251935e..a5d5ebb408d9e526a5b4eafd360e062c99742fd5 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 6b59037ccdb98706dd6867221a366ba09897fc42..4d3c3e767b503903aa30cf44727e94a098d17eb9 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 655f3eb1d55aa9c2167471edd24b79efe81e83ec..10642c3b8365670db2c6395e241b54cc31bfcf9f 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 c01d06f27328e19efee5ef5566a33e4e2a760c36..abda5606898aaec851b867fd3893a41245800aed 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 fc71f539c35f2c9c1a4b197ea998aa62d4059419..01022b59b3293ff16c42940e3f533d6f6e817ff7 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 67ee9e560082dd78ef9699e5caa3a6cb4ec8b831..a68664bc145b0f4ff7b2b493e4cdbd6c9d91cfdb 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 4450a2c6164f4d144ef896d667d0012128df93b8..7d238f7022a7b7f6f0d51a025565b6a3b0b377ef 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 7424edf2621eed79273ef5aaf3aa9b7eee8bcae8..4c24808c6861e7843d51161bc7a3c7dfccdbaf3a 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 2036f1764ff4d52a7d52d1715f7ebcb8290b49d3..6af0950071f09baf001424dbdf824c11da5f0825 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 e76bc18b5e924b3afd33d84e8014249b7a06a4b3..cd5eb8c04422574a349f3106417f3ce5435a68d5 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 7f5a2630fcac66240007038bf7af1e1b4847f4db..f371833ebd1cd198c002b900d0eab0b051c98164 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 c5ee023ee6e9afe9aca090acf3174612479a806c..8cbb43df354a5e41e422c4e10a27bb80c6e02ffe 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 5746da83e5262569f27fa3c3f0ce8f343faac4c5..1b77f74b6eafbfd886f7a51e7e25b97fa0355246 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 3234acb85b7fb33d09908f51dd32a3dbd54ca0c9..46f04c1b11b598f9eb9b7df62e9b2c895c5ab7f7 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 a7739dfb5048cbe2bac7b48eb9a81310f9686357..92c390ed83de96357b7685073c018ca475812f88 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 0b3c5ed87cbcf5fd8486b382932bf6ad2e581b52..77ce96f4026e721865689165a5ea752dd1960ef9 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 d1991c018fa70301b3597dd3b2a600bb8cf6e2f5..75ce9f047e5c11f2bf65168b4c90c2312505cdea 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 b55a6c3594e205d153005faf953f858087ac381e..30cd453f3201bcbcc01e8328afc54d5c8dab3a19 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 b9adb5bc00c9443da525903f2f8fae22a30428d4..92f1f0c937bda1ff328a748491272b2ac3bec9b6 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 c647e45efa48061d1a49c262c0a570c9e84f7fc4..5ab7e5499fd6e6595b7a2f6b9ae4d001d7308b95 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 6eb36c642facf1388e340469cfae93021bf39aab..8d0f102ebd2fa2086e1ce8ea37b6a33300e7485e 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 ed1af998959e6bf5ea8c40ffc08b020059d713c0..0e975b3d1773d3dbf07ca008f6ec30a7e4b04dde 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 26f20938f0d9303ef3c553fe4d0dfa27f539309a..d797068f1f2fc532dc3431fc118961d05bfe42a5 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 fe00d9d7ea24e1faf2fd42c575484ddb19e8b9fa..72f02d28afa93e3dc33eece57c9b3e4b6f66cfa3 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 316ea500c54c49781f45a250a8bf8b9d2525a23c..a05f94346b7bddf3b8f0996853ea37ac2104ba59 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 203ec9b295c75233a3d97a34d0038488fa496bc5..9d299b3fce8c0f13f6d18a65d4567573a0552aad 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 30f0de4d3066f0f3238b172c37e0e37d1bacc358..6348e46e748eebdcb4e9093d725c610f8ac62ed1 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 a9c7d75c0ffdd218888c6e7e4fbdc847f44d489b..5d4d1b9132de9106566c1897cd767386271d69a5 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 c1135d4a3260b5300dc6b325275885d1a4b0660e..d89ff918439946691ec10cc6ba1cad473a6201c4 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 57692004a07f258e1e459a6b187a664516fe23db..36736684456b6576bbf99f82028de38215000bd2 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 f2d14934f17ee7d039f300bb7ab815b1a0278795..55a8ee6383eeb932d013a720178508e759e6edd9 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 c43f5a9a2b5cb76ebf688ce6401abc01f77644af..7f10ccea8b12b5d11c183ee51df83d989bb801d7 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 9faf3a6e375c3aab037011a1ef4ace7140db1024..449b10f48ae298e5f8fa818fedb47f492ee7d9db 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 357b561e362d3731c249f0d420209631dacc0d61..313cbb50c8984af6dfa672e575c54f191fa00f03 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 4386bd73856dd9b63456bf2aa7f3a4787ab31edd..c2ad3e8b846549d5ae5217a093d4606a7c660a83 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 0ed73faa7bf08b4bb80cb626fd8e8e47aab1788a..3bfae4e13f28969165f5796a8d00381ee918d100 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 d6deebcf57bc0f1e2454165b4c9174e3e2029c99..bb72b8e38907c1fa4c8524c7b1f2619c5edc9885 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 33af72d0b95f4ff5c47953a8ab7b322c7a1e0946..3d5ce6d7804dbd1394779882cd2f46cb8e2c6033 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>