diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt
index 755583f36049fe47985c82341dd1294564666f96..ab77a3cc89adf9235c05bd7b4fc91e0d181d9894 100644
--- a/App/CMakeLists.txt
+++ b/App/CMakeLists.txt
@@ -50,7 +50,7 @@ add_executable(${executable_name}
target_link_libraries(${executable_name} ${BornAgainGUI_LIBRARY} ${Boost_LIBRARIES})
target_include_directories(${executable_name}
PUBLIC
- ${BornAgainGUI_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}
${Boost_INCLUDE_DIRS})
# -----------------------------------------------------------------------------
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 330fcf14a8e84ab9b02f1ff4161024ae933a7419..4b4af64667bcf2dccf6a159c7940721803dc3d03 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -13,34 +13,9 @@ set(library_name BornAgainGUI)
# --- source and include files ---
-set(include_dirs
- ${CMAKE_CURRENT_SOURCE_DIR}/Application
- ${CMAKE_CURRENT_SOURCE_DIR}/CommonWidgets
- ${CMAKE_CURRENT_SOURCE_DIR}/InfoWidgets
- ${CMAKE_CURRENT_SOURCE_DIR}/Items
- ${CMAKE_CURRENT_SOURCE_DIR}/Mapper
- ${CMAKE_CURRENT_SOURCE_DIR}/Session
- ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow
- ${CMAKE_CURRENT_SOURCE_DIR}/utils
-)
-
-file(GLOB model_dirs ${CMAKE_CURRENT_SOURCE_DIR}/Models/*)
-list(APPEND include_dirs ${model_dirs})
-file(GLOB views_dirs ${CMAKE_CURRENT_SOURCE_DIR}/Views/*)
-list(APPEND include_dirs ${views_dirs})
-
-set(source_files)
-set(include_files)
-set(form_files)
-
-foreach(dir ${include_dirs})
- file(GLOB source ${dir}/*.cpp)
- file(GLOB include ${dir}/*.h)
- file(GLOB forms ${dir}/*.ui)
- list(APPEND source_files ${source})
- list(APPEND include_files ${include})
- list(APPEND form_files ${forms})
-endforeach()
+file(GLOB_RECURSE include_files *.h)
+file(GLOB_RECURSE source_files *.cpp)
+file(GLOB_RECURSE forms_files *.ui)
set(resource_files
gui.qrc
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index bf55052c02cdbf36a3d9479d3b74b056ee0c123f..be38c9cbbf39d0fe6dea6f119b9bcb3bb3afbe7d 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/FitParameterWidget.h"
-#include "GUI/InfoWidgets/OverlayLabelController.h"
+#include "GUI/Widgets/Info/OverlayLabelController.h"
#include "GUI/Items/FitParameterItems.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/JobItem.h"
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.h b/GUI/Views/FitWidgets/FitParameterWidget.h
index 41f9480dd9c128b17a0e85361bf45711e919e06f..385d55e0c6ee7e7dc2964118132f6e4bd1096ce6 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/Views/FitWidgets/FitParameterWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <memory>
class JobItem;
diff --git a/GUI/Views/FitWidgets/JobRealTimeToolBar.h b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
index 792f1519a988980530bfa9f23f0daecf4875e15c..51dab31c4862cc9a1a4d85cfc331df25b20ae217 100644
--- a/GUI/Views/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
class QToolButton;
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.h b/GUI/Views/FitWidgets/JobRealTimeWidget.h
index d405015bb5ef9cf27bddb105a456e7ab80af9ced..ea4478d12a997459ebd6ce62ea1b46d816e87430 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.h
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
-#include "GUI/CommonWidgets/ItemStackPresenter.h"
+#include "GUI/Widgets/Common/ItemStackPresenter.h"
class JobModel;
class JobItem;
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index 2a3181b70822b7c0caf7bfec0ff92bfa2b8e0ed9..4244535c288947568361a32973f91423e6f4c37e 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/ParameterTreeItems.h"
#include "GUI/Items/SessionItemUtils.h"
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index 72fe8a4ac8e25d5871a445b728a99f34024088e1..90bc485b16b475e1d5e8aacfde9df87df1ad54bc 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/ParameterTreeItems.h"
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.h b/GUI/Views/FitWidgets/ParameterTuningWidget.h
index 1392228c9b446a089f8d355cb5cd25c0bfe3176d..51166dd545f80e4d11072eb12baf6b3627832401 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.h
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class JobRealTimeToolBar;
class JobModel;
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 40def85c021ed730c16567a323166378c2c58666..7789e1b216880102d0d7b267e8fb147f27ab65c2 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.h b/GUI/Views/FitWidgets/RunFitControlWidget.h
index a3b7c011ef34f40b4321d52b3516cac3066ee9f1..397ba9391227592761bc86fe6a7ca8d63e684476 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <QWidget>
class JobItem;
diff --git a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
index 1f3444fad402401cf4ff46e763192efdee2c3592..2cd86aac84379ab02a24129ca488c14e3f76d5bd 100644
--- a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class SessionItem;
class MaskEditor;
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.h b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
index 0c800efdf782dc3d352aac567850046cebf347b3..8c521d14f44b4854e240502825e4acc1b81b914f 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
-#include "GUI/CommonWidgets/ItemComboWidget.h"
+#include "GUI/Widgets/Common/ItemComboWidget.h"
class RealDataMaskWidget;
class QAction;
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 399e368265e6a2c307d47439306f4e093fdf98cd..6adb8405e4b1f4d662a3c9665cd4b33ac3930573 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
diff --git a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index ca5a3bb98d3b96258465da945a6e0e44a391ffa1..8f61a58fb136ab6a483c81f9282442621d533f59 100644
--- a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/BeamWavelengthItem.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index f09b10f798b074c40fa932949c2c3726fcf0814b..35d7bd07e1b442e6c3aeacc03517764c969cc451 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/DistributionItems.h"
#include "GUI/Items/ItemWithDistribution.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index d170416aad3b21983c8666ca079d349abe669dc4..856373fa7455532d953ade9ebec0806ee76cc577 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/DistributionItems.h"
#include "GUI/Items/RealLimitsItems.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
index 3f7b835ae5553d598394dad1b5c835aa02b6ef81..db79d5f2eb0aa9a2726cd0f21059d289720e43aa 100644
--- a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index 318a2f6a6d8839a6d039e28553262606187f1444..b09fee36dbac0ab901d9225e80621e4d12d49c66 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Session/SessionData.h"
#include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index b805a09425dbde7fd0eeef1a7565d155e9b46142..8242e18a7c138b805a9bf6f9f74169d794b6a654 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Project/projectdocument.h"
diff --git a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
index 4531013fce2e444fb7c761a7783b8702b4bed373..171be13ee2d20cff9447d3661f075aa51113a60e 100644
--- a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
index 2eb5d9dd2ef4648956e7ce05f5edfbd86ea26d82..e45f9d6a0e7dafcbbb2e265651a989ae785bb47c 100644
--- a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index b0368d3b71038ad70a179aa33656d1aa37eda06a..9691311d6e4fa17392ac99572956cb3df8c05b7b 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
index dc461241ddb694b57ee066399fcc334293f012be..41bb9ad754283702d278671ca386ee0bfa9cb996 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class ColorMap;
class FontScalingEvent;
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 521ec47dcbbe5e78d878581d7cd2597113b708be..40d7020cbdf8cacdff5d9bb83cf8f9bf062b99cc 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
index e8df4d64b7ba5b5c8f5577fa9632cf39a6ce30f3..bd8080a8fed02a961e385661ab85ce1455d5c2cb 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
#include "Device/Data/OutputData.h"
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index d3ef3b7e227545c7482274640b8e319b83247589..f940a9a16e9ba510ebc193f8720d72b89aeeb713 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index 170fd81f11a510981d6065ac41b527a8c059aace..2a313b797e0871baada19890bae1cf5110c2623e 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class IntensityDataItem;
class ComponentEditor;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
index 35ebfaa1d62af98ebd6c29a24df9b0f0a3dcd8fe..d13baf9a65dcef7c6e026a4a26c0909f927734f2 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
index d79c8bd309778a58ebd8d8eab0462803d64bbeb3..4b71ecc3b864a46b5bbec1cfa0fd41b5846cc6c4 100644
--- a/GUI/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/Plot1D.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/Data1DViewItem.h"
#include "GUI/Items/DataItem.h"
diff --git a/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
index 4c11273bfaf2f3747d578cd0dee1374be9c17282..1f214aa9a496e80bd77179624bcbd8994658103b 100644
--- a/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
+++ b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
-#include "GUI/CommonWidgets/StatusLabel.h"
+#include "GUI/Widgets/Common/StatusLabel.h"
#include <QList>
class ScientificPlot;
diff --git a/GUI/Views/IntensityDataWidgets/ScientificPlot.h b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
index fc13e6d3f71a24fc59028f12094824fe0ffedd7a..6e2a84ee2f6cfb8009bb2ddde7f940b02f07fca8 100644
--- a/GUI/Views/IntensityDataWidgets/ScientificPlot.h
+++ b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <memory>
class PlotEventInfo;
diff --git a/GUI/Views/IntensityDataWidgets/plot_constants.h b/GUI/Views/IntensityDataWidgets/plot_constants.h
index 2efeb7ba0fac965bbc3354e998ebbb292b2534e5..4df3ea41410965512389003dc085157356b2718a 100644
--- a/GUI/Views/IntensityDataWidgets/plot_constants.h
+++ b/GUI/Views/IntensityDataWidgets/plot_constants.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT_CONSTANTS_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT_CONSTANTS_H
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QSize>
namespace GUI::Constants {
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget.h b/GUI/Views/JobWidgets/FitComparisonWidget.h
index d63d93861348bc5d37fc8a268e590924cc196d08..2449e6b2dc6229945290df78e75d32eac88d3cd6 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget.h
+++ b/GUI/Views/JobWidgets/FitComparisonWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <QMap>
class JobItem;
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget1D.h b/GUI/Views/JobWidgets/FitComparisonWidget1D.h
index a979cb85f1660f90f893440490a94d3998d73e2b..8ea9530095f51d2af98514236a2bba4d35cd4d92 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget1D.h
+++ b/GUI/Views/JobWidgets/FitComparisonWidget1D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class Data1DViewItem;
class FitComparison1DViewController;
diff --git a/GUI/Views/JobWidgets/FitFlowWidget.h b/GUI/Views/JobWidgets/FitFlowWidget.h
index a8e7e0b5efa462403e372584355de216aeb88d01..43da7229bbd4d823afb5e5c1300bf2c4e8631a97 100644
--- a/GUI/Views/JobWidgets/FitFlowWidget.h
+++ b/GUI/Views/JobWidgets/FitFlowWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class HistogramPlot;
class FitSuiteItem;
diff --git a/GUI/Views/JobWidgets/JobListView.cpp b/GUI/Views/JobWidgets/JobListView.cpp
index 46a181d0c2f9aa010de33e08b121ab9ec2d44cb3..7264fcf18dffdb8bd53bc0c01a7622d4e087263b 100644
--- a/GUI/Views/JobWidgets/JobListView.cpp
+++ b/GUI/Views/JobWidgets/JobListView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobListView.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.h b/GUI/Views/JobWidgets/JobMessagePanel.h
index 06c81dfdd5e002ff9708b223f6bb184462f66f44..26415ac57b19896052c0257a48700209eb58cb9a 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/Views/JobWidgets/JobMessagePanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
-#include "GUI/CommonWidgets/InfoPanel.h"
+#include "GUI/Widgets/Common/InfoPanel.h"
#include "GUI/Views/FitWidgets/FitLog.h"
#include <QColor>
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 392c61ca8f3a358e1f04aff40e753ffed8006d6a..d6e64c267f2f14c1bee0e030dd847acdf18cbe41 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Views/JobWidgets/JobPropertiesTableModel.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/JobWidgets/JobResultsPresenter.h b/GUI/Views/JobWidgets/JobResultsPresenter.h
index d2b53dca40dc3422484f77046fcd9975785f7cb2..50ecd67e75bcab0209589ea2fbfaf596e8f0d480 100644
--- a/GUI/Views/JobWidgets/JobResultsPresenter.h
+++ b/GUI/Views/JobWidgets/JobResultsPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
-#include "GUI/CommonWidgets/ItemComboWidget.h"
+#include "GUI/Widgets/Common/ItemComboWidget.h"
class InstrumentItem;
class JobItem;
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index c25e710bd42a749dfd70ea3ef0480ed3ae506175..00da33d2ff3fed4be14a26dc9cd896fccb89cdf3 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobView.h"
-#include "GUI/CommonWidgets/DocksController.h"
+#include "GUI/Widgets/Common/DocksController.h"
#include "GUI/Items/JobItem.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/Models/Job/JobModel.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 0a455ec85991607fff6bb7f6bcd3e774745c89b6..9ee1499121e69e9c9c86cea9f640f76b10ea345d 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/VectorItem.h"
diff --git a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
index e79459afadc81280997502bc345d97c9f315bdd2..4d892902e645289ded2dd5631220543fee7be31b 100644
--- a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class ProjectionsEditor;
class IntensityDataItem;
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
index cf5b08855d174dfe35209de3147bc0d6d398365e..57e647a0f53c7145e41ba30d9ff1e4f0623ad5eb 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <QMap>
#include <memory>
#include <qcustomplot.h>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h b/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
index 0b9bf88e65844b2753dd1b0a57e8f005030b8e55..3845429627ad042127e0394500dfe7918dc6939e 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class ComponentEditor;
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
index fb5f3eb0a6a805b91ec4519bd83f1a734d9cc6d3..880421df293fda0a0ca9a3bebaa62323c4850e39 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include "GUI/Views/MaskWidgets/MaskEditorFlags.h"
class ProjectionsPlot;
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index bedc9ddb49175ddb1bbb12b89c14e8f56e026b5e..a5428578564ab5ca46c47599aada842dccc2e55b 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index d65404b6127277b25ffac119e8776d3c5b19773f..a225034b3f1fa2c11551d44495f70a57b9168b64 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Session/SessionData.h"
#include "GUI/mainwindow/projectmanager.h"
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index d874546bc07c5ba5395675c9bb427cfa46efb460..0aebf38fd159943dc6b662ad17f9ef03cdc6d761 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/SessionFlags.h"
#include "GUI/Items/SessionItem.h"
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index d0a35f1205f50fb1b3faa1f532ea5a18a8eee0e5..0948e848acee435ef97443e1fcdb52aae0277604 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/TestComponentView.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/BeamItems.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/ParticleItem.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 9ced2fc0325214cefc38500815839bdaef913204..9da5431cd65ddca16f8c96155dbd6089e716e513 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
index a232f4202d0ee34d98b83bf21381f48a77597900..82e9a2edb7f38218c4b0ff5cad2e0ae01136bc12 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
class QToolButton;
class QCheckBox;
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index b33a95f9313aa67d1d7d81230d2a72a93dbeaf5d..3092e19d8be0564bbcc0cabee691cdb766278a73 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ConnectableView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
index fc2ef648f7cccda47e1aef9faaf024ef29ca5c03..7bd01b9ce7078edec0fbf44ea409f79f03bc4333 100644
--- a/GUI/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include <QDrag>
#include <QPixmap>
#include <QWidget>
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index c708653ce371ceeff721f55ec589d8243696b568..ecad516eddd620ee30a3993dc195c173c58f011d 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/ItemFactory.h"
#include "GUI/Items/MesoCrystalItem.h"
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index 34c761d6a25ac6f269c2432b852df972dd022f7d..cb5d6a26fa45ab01c7c27cc9f9c1f20f09bc3109 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
diff --git a/GUI/Views/SampleDesigner/InterferenceViews.cpp b/GUI/Views/SampleDesigner/InterferenceViews.cpp
index 3de6f266d770262c5242f3edb5eadf5c5faa3c7b..7c3566d16f27735c8e47fc70a552f49f527e80be 100644
--- a/GUI/Views/SampleDesigner/InterferenceViews.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceViews.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/InterferenceViews.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
Interference1DLatticeView::Interference1DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
index 6621934524c1e3ea355830b075494261f59e4516..29298f8fc046641e38ca272edd08aed019608990 100644
--- a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index 806808cec785fa0fe661342e85a164a341d6414c..45c17ee2442c1437f370a0d10ddaa5f4d507dc6f 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
diff --git a/GUI/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
index 89d861bea5f017cfd4452a16737abeca8d0acc99..d547b7f06832e7b45adbd9ae0f6768dc894fc500 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MesoCrystalView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/ParticleItem.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index 1d86b99259830b56a0f742d59399b80d4d9c13d9..c44ea348b944ef9133fb1700f8e538aac8e13a94 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
diff --git a/GUI/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
index 856e2bb689602b6e422ee1ed8a21c436434464ed..e00921527e98a4063d291e1bd393826b9c08b076 100644
--- a/GUI/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/NodeEditorPort.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include <QGraphicsScene>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
index b5b27ad1ece8988b228597767163c3411933f757..3d01e3f1a39de1abf79ca0cb872bcfa511555da6 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCompositionView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/ParticleItem.h"
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
index 4d254fc6e76043a2c0e514d7e25ecf217fd014d8..c62e12bd8725bca207cae8ab7022485397ee86ac 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCoreShellView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/ParticleCoreShellItem.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index 59d0acf3172050a8769c088010f5e9d89d62c820..e551ea0fe3139a5e9add775de95082a63011ae05 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/SessionItem.h"
#include "GUI/Views/SampleDesigner/ParticleView.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index f3b1fbd1785c0cf25c182471acf030347e9fe833..9296dc85f976d10ebb648aa3fde3b6a451d76785 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ParticleItem.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index e8e515c31ae271524a805b5c89cd9e2725a3e52e..e99d9d4968acad010bb6f3a6e94712470bb0fbee 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SampleDesigner/SampleListView.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.h b/GUI/Views/SampleDesigner/SampleToolBar.h
index e5df4beea033df6ca710405660207b029d2796d7..10e3d7ce0142c9728c81db7dce61115e30bc03f5 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/Views/SampleDesigner/SampleToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include <QTreeView>
class QAction;
diff --git a/GUI/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
index a78bcd9f34ca8e89ed7a327e87b3bdea2092685f..39546a3def48e1e0fd21b751a027543646dd800e 100644
--- a/GUI/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
index 9f7691f6867cd2da736a914978697eaa91caa98b..28b8c2c4027075316cc85eda796b1079a9873044 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/Views/SampleDesigner/ScriptPanel.cpp
@@ -14,10 +14,10 @@
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "Core/Export/ExportToPython.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
-#include "GUI/InfoWidgets/CautionSign.h"
-#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
+#include "GUI/Widgets/Info/CautionSign.h"
+#include "GUI/Widgets/Info/PythonSyntaxHighlighter.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Domain/DomainObjectBuilder.h"
#include "GUI/Models/Sample/SampleModel.h"
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.h b/GUI/Views/SampleDesigner/ScriptPanel.h
index 6406b06edede7c792cd285209db20da238464ba6..ea336c7574f04d5720a083f616da5a996417280f 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.h
+++ b/GUI/Views/SampleDesigner/ScriptPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
-#include "GUI/CommonWidgets/InfoPanel.h"
+#include "GUI/Widgets/Common/InfoPanel.h"
class SampleModel;
class PythonSyntaxHighlighter;
diff --git a/GUI/Views/SampleDesigner/TransformationView.cpp b/GUI/Views/SampleDesigner/TransformationView.cpp
index 17481742a59a8f97daf640c9bba796d7fb0211cc..3bbf2a5923915b25c4257456e9d83c2519f13ebf 100644
--- a/GUI/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/Views/SampleDesigner/TransformationView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/TransformationView.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
TransformationView::TransformationView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
index efde2249216850d7343884240c71ebf91e6564da..e278e7c7cfdab1fedd6980fae15af72c2dc8ad28 100644
--- a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -16,11 +16,11 @@
#include "Core/Export/ExportToPython.h"
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
-#include "GUI/InfoWidgets/CautionSign.h"
-#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
+#include "GUI/Widgets/Info/CautionSign.h"
+#include "GUI/Widgets/Info/PythonSyntaxHighlighter.h"
#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
index 6f9f784c5b8412ea246068372f2bdf2377212fe5..c3d522de8146dd8c82b8c8a25242f6a0f7c97f5a 100644
--- a/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
index 4c28ecb976e378a0885e0bd587781756e9f40179..dac70f07434a46a21a162f14b84224f4bbc24d51 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <QWidget>
class SpecularDataItem;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
index e231c1ec932a61dad7a6e8932f682318c06849e6..4a5b3345292e91b927963fb64a52b37396dfc15d 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "qcustomplot.h"
#include <memory>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
index 9ff469c5a3b362de77cc043fdf014ea52de37620..7ddb50b7a7604d91cd4d33716952d97b36036303 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
@@ -300,7 +300,7 @@
<customwidget>
<class>StyledToolBar</class>
<extends>QWidget</extends>
- <header>GUI/CommonWidgets/StyledToolBar.h</header>
+ <header>GUI/Widgets/Common/StyledToolBar.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
index 639649217c632d6151fc2cc7b2f8a4ae941bc012..9aa5bda91101b07ed9483813c96242433958875c 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class SpecularDataCanvas;
class SpecularDataItem;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
index 3e576cf85045d5912e7336b4f148d14a004d699a..57c073ab90bed469a7b0ce57fa6b7ec3db7412dc 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SpecularDataWidgets/SpecularPlot.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/SpecularDataItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
index f17b0c8ec4a747f8efb3d9bc462b9d350a675656..4518455de413c45e7dd1fdb2df03c0624ccc4241 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Views/Toplevel/ImportDataView.h b/GUI/Views/Toplevel/ImportDataView.h
index c2e1013546c498741cb992a2c036d38581c3448d..fa5c7ec8664e2c5395a3363f821e9786e5605212 100644
--- a/GUI/Views/Toplevel/ImportDataView.h
+++ b/GUI/Views/Toplevel/ImportDataView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
-#include "GUI/CommonWidgets/ItemStackPresenter.h"
+#include "GUI/Widgets/Common/ItemStackPresenter.h"
#include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
class RealDataModel;
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index c788711576073f8f5b3cb2d06e002d3fe122ecf3..0ac036c7a08173f72db060e5cbccd64376cb6367 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/CommonWidgets/DocksController.h"
+#include "GUI/Widgets/Common/DocksController.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Project/projectdocument.h"
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 4cdb3cb357603ad0f0ada3a7e848f2e85877bb64..8de65fa7014f7ae21b702e734c807123f467f742 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SessionModelView.h"
-#include "GUI/CommonWidgets/ModelTreeView.h"
+#include "GUI/Widgets/Common/ModelTreeView.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
diff --git a/GUI/CommonWidgets/AdjustingScrollArea.cpp b/GUI/Widgets/Common/AdjustingScrollArea.cpp
similarity index 93%
rename from GUI/CommonWidgets/AdjustingScrollArea.cpp
rename to GUI/Widgets/Common/AdjustingScrollArea.cpp
index 9f2e1bb361fdf45763a0b6440fbb9e85317792a2..8871197e78588db2f372a535a7b8308a052deb49 100644
--- a/GUI/CommonWidgets/AdjustingScrollArea.cpp
+++ b/GUI/Widgets/Common/AdjustingScrollArea.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/AdjustingScrollArea.cpp
+//! @file GUI/Widgets/Common/AdjustingScrollArea.cpp
//! @brief Implements class AdjustingScrollArea
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/AdjustingScrollArea.h"
+#include "GUI/Widgets/Common/AdjustingScrollArea.h"
#include <QEvent>
#include <QScrollBar>
diff --git a/GUI/CommonWidgets/AdjustingScrollArea.h b/GUI/Widgets/Common/AdjustingScrollArea.h
similarity index 80%
rename from GUI/CommonWidgets/AdjustingScrollArea.h
rename to GUI/Widgets/Common/AdjustingScrollArea.h
index 3a6305627215f2645d744ecf8e4932e7d96bb30a..fbc1c3ea91993470732d4e9669d429ec2b3b3cee 100644
--- a/GUI/CommonWidgets/AdjustingScrollArea.h
+++ b/GUI/Widgets/Common/AdjustingScrollArea.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/AdjustingScrollArea.h
+//! @file GUI/Widgets/Common/AdjustingScrollArea.h
//! @brief Defines class AdjustingScrollArea
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ADJUSTINGSCROLLAREA_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ADJUSTINGSCROLLAREA_H
#include <QScrollArea>
@@ -33,4 +33,4 @@ private:
bool eventFilter(QObject* obj, QEvent* ev);
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ADJUSTINGSCROLLAREA_H
diff --git a/GUI/CommonWidgets/DesignerHelper.cpp b/GUI/Widgets/Common/DesignerHelper.cpp
similarity index 98%
rename from GUI/CommonWidgets/DesignerHelper.cpp
rename to GUI/Widgets/Common/DesignerHelper.cpp
index e250e6fa3e5717adc1dd52936f4847e8d8b18ad6..12197cc7c515bd231d30c0e16f1529ab2a589252 100644
--- a/GUI/CommonWidgets/DesignerHelper.cpp
+++ b/GUI/Widgets/Common/DesignerHelper.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/DesignerHelper.cpp
+//! @file GUI/Widgets/Common/DesignerHelper.cpp
//! @brief Implements class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/MaterialItemUtils.h"
#include <QPainter>
#include <cmath>
diff --git a/GUI/CommonWidgets/DesignerHelper.h b/GUI/Widgets/Common/DesignerHelper.h
similarity index 92%
rename from GUI/CommonWidgets/DesignerHelper.h
rename to GUI/Widgets/Common/DesignerHelper.h
index 5e3f407af58ad8d52f7eac1f19f20d82a8f7cd2c..898c50083d4d19ea485247fde277fa2e4ef053b1 100644
--- a/GUI/CommonWidgets/DesignerHelper.h
+++ b/GUI/Widgets/Common/DesignerHelper.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/DesignerHelper.h
+//! @file GUI/Widgets/Common/DesignerHelper.h
//! @brief Defines class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DESIGNERHELPER_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_DESIGNERHELPER_H
#include <QColor>
#include <QGradient>
@@ -75,4 +75,4 @@ public:
static int getPythonEditorFontSize();
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DESIGNERHELPER_H
diff --git a/GUI/CommonWidgets/DockWidgetInfo.cpp b/GUI/Widgets/Common/DockWidgetInfo.cpp
similarity index 91%
rename from GUI/CommonWidgets/DockWidgetInfo.cpp
rename to GUI/Widgets/Common/DockWidgetInfo.cpp
index 2460406386131eedde1928a900ac58991ad5714f..cb112473abd410823092712002a06d482b4ba940 100644
--- a/GUI/CommonWidgets/DockWidgetInfo.cpp
+++ b/GUI/Widgets/Common/DockWidgetInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/DockWidgetInfo.cpp
+//! @file GUI/Widgets/Common/DockWidgetInfo.cpp
//! @brief Implements class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/DockWidgetInfo.h"
+#include "GUI/Widgets/Common/DockWidgetInfo.h"
#include <QDockWidget>
#include <QWidget>
diff --git a/GUI/CommonWidgets/DockWidgetInfo.h b/GUI/Widgets/Common/DockWidgetInfo.h
similarity index 82%
rename from GUI/CommonWidgets/DockWidgetInfo.h
rename to GUI/Widgets/Common/DockWidgetInfo.h
index 88573a79e0dc721b4f05db70b8f77daf72074dce..ac8e7480f34cdaf58c0988fa949ef38eab480318 100644
--- a/GUI/CommonWidgets/DockWidgetInfo.h
+++ b/GUI/Widgets/Common/DockWidgetInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/DockWidgetInfo.h
+//! @file GUI/Widgets/Common/DockWidgetInfo.h
//! @brief Defines class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DOCKWIDGETINFO_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_DOCKWIDGETINFO_H
#include <qnamespace.h>
@@ -37,4 +37,4 @@ private:
Qt::DockWidgetArea m_area;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DOCKWIDGETINFO_H
diff --git a/GUI/CommonWidgets/DocksController.cpp b/GUI/Widgets/Common/DocksController.cpp
similarity index 98%
rename from GUI/CommonWidgets/DocksController.cpp
rename to GUI/Widgets/Common/DocksController.cpp
index 8f4758e946c1ca87e16a1b7095a1ecdaa894d0dc..f31d7bd7415c4660543d37cc181642c4e82de04f 100644
--- a/GUI/CommonWidgets/DocksController.cpp
+++ b/GUI/Widgets/Common/DocksController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/DocksController.cpp
+//! @file GUI/Widgets/Common/DocksController.cpp
//! @brief Implements class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/DocksController.h"
+#include "GUI/Widgets/Common/DocksController.h"
#include "Base/Utils/Assert.h"
#include "GUI/utils/Error.h"
#include <QAbstractItemView>
diff --git a/GUI/CommonWidgets/DocksController.h b/GUI/Widgets/Common/DocksController.h
similarity index 88%
rename from GUI/CommonWidgets/DocksController.h
rename to GUI/Widgets/Common/DocksController.h
index 1d5a4f99a806e5df53ef7308078484d262ce7896..992cb15774dfc210cc7f68979f2754a6d243828f 100644
--- a/GUI/CommonWidgets/DocksController.h
+++ b/GUI/Widgets/Common/DocksController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/DocksController.h
+//! @file GUI/Widgets/Common/DocksController.h
//! @brief Defines class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DOCKSCONTROLLER_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_DOCKSCONTROLLER_H
-#include "GUI/CommonWidgets/DockWidgetInfo.h"
+#include "GUI/Widgets/Common/DockWidgetInfo.h"
#include <QObject>
#include <QSize>
#include <map>
@@ -72,4 +72,4 @@ private:
bool m_handleDockVisibilityChanges = true;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DOCKSCONTROLLER_H
diff --git a/GUI/CommonWidgets/InfoPanel.cpp b/GUI/Widgets/Common/InfoPanel.cpp
similarity index 96%
rename from GUI/CommonWidgets/InfoPanel.cpp
rename to GUI/Widgets/Common/InfoPanel.cpp
index 5f85716bde065f3b3de6a40ccff9af5ed0675687..a978cb14768df084505caaa89627ed3a226dfc9b 100644
--- a/GUI/CommonWidgets/InfoPanel.cpp
+++ b/GUI/Widgets/Common/InfoPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/InfoPanel.cpp
+//! @file GUI/Widgets/Common/InfoPanel.cpp
//! @brief Declares class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/InfoPanel.h"
-#include "GUI/CommonWidgets/InfoPanelToolBar.h"
+#include "GUI/Widgets/Common/InfoPanel.h"
+#include "GUI/Widgets/Common/InfoPanelToolBar.h"
#include <QBoxLayout>
#include <QResizeEvent>
#include <QStackedWidget>
diff --git a/GUI/CommonWidgets/InfoPanel.h b/GUI/Widgets/Common/InfoPanel.h
similarity index 87%
rename from GUI/CommonWidgets/InfoPanel.h
rename to GUI/Widgets/Common/InfoPanel.h
index 7112e212b1cf8b54d00d9423bfa7f2b98abc09c4..07f84083f4f7e13e1fd5239bb45d17532c0b110c 100644
--- a/GUI/CommonWidgets/InfoPanel.h
+++ b/GUI/Widgets/Common/InfoPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/InfoPanel.h
+//! @file GUI/Widgets/Common/InfoPanel.h
//! @brief Defines class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANEL_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANEL_H
#include <QFrame>
@@ -51,4 +51,4 @@ protected:
int m_cached_height;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANEL_H
diff --git a/GUI/CommonWidgets/InfoPanelToolBar.cpp b/GUI/Widgets/Common/InfoPanelToolBar.cpp
similarity index 94%
rename from GUI/CommonWidgets/InfoPanelToolBar.cpp
rename to GUI/Widgets/Common/InfoPanelToolBar.cpp
index abcd0f948f99ad8caeca8ddc2cbc507216a9331d..c3ea02bdafc981b4346b022cfbfb708673c6a392 100644
--- a/GUI/CommonWidgets/InfoPanelToolBar.cpp
+++ b/GUI/Widgets/Common/InfoPanelToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/InfoPanelToolBar.cpp
+//! @file GUI/Widgets/Common/InfoPanelToolBar.cpp
//! @brief Declares class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/InfoPanelToolBar.h"
+#include "GUI/Widgets/Common/InfoPanelToolBar.h"
#include <QAction>
#include <QHBoxLayout>
#include <QToolButton>
diff --git a/GUI/CommonWidgets/InfoPanelToolBar.h b/GUI/Widgets/Common/InfoPanelToolBar.h
similarity index 78%
rename from GUI/CommonWidgets/InfoPanelToolBar.h
rename to GUI/Widgets/Common/InfoPanelToolBar.h
index 609b1e3782d5b9d097ec846f453cea8c07a69867..ca93e01ddc642bf8ac83962f34fe66903c851678 100644
--- a/GUI/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/Widgets/Common/InfoPanelToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/InfoPanelToolBar.h
+//! @file GUI/Widgets/Common/InfoPanelToolBar.h
//! @brief Defines class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANELTOOLBAR_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANELTOOLBAR_H
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
class QAction;
@@ -41,4 +41,4 @@ private:
bool m_expanded;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANELTOOLBAR_H
diff --git a/GUI/CommonWidgets/ItemComboToolBar.cpp b/GUI/Widgets/Common/ItemComboToolBar.cpp
similarity index 96%
rename from GUI/CommonWidgets/ItemComboToolBar.cpp
rename to GUI/Widgets/Common/ItemComboToolBar.cpp
index feb030a2f202f2d2399ee046dc5dfe137cdcbc7c..3f04e511d402328329b2ad8b774199af33de4c87 100644
--- a/GUI/CommonWidgets/ItemComboToolBar.cpp
+++ b/GUI/Widgets/Common/ItemComboToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemComboToolBar.cpp
+//! @file GUI/Widgets/Common/ItemComboToolBar.cpp
//! @brief Implements class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/ItemComboToolBar.h"
+#include "GUI/Widgets/Common/ItemComboToolBar.h"
#include "Base/Utils/Assert.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/CommonWidgets/ItemComboToolBar.h b/GUI/Widgets/Common/ItemComboToolBar.h
similarity index 84%
rename from GUI/CommonWidgets/ItemComboToolBar.h
rename to GUI/Widgets/Common/ItemComboToolBar.h
index 1de82ab662226d488b9e93d7ed93b7a3291bc4fe..e03aad4ffa631308f3497c0ddf8dce835f66803a 100644
--- a/GUI/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/Widgets/Common/ItemComboToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemComboToolBar.h
+//! @file GUI/Widgets/Common/ItemComboToolBar.h
//! @brief Defines class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOTOOLBAR_H
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include <QList>
class QAction;
@@ -51,4 +51,4 @@ private:
QAction* m_comboBoxAction;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/CommonWidgets/ItemComboWidget.cpp b/GUI/Widgets/Common/ItemComboWidget.cpp
similarity index 96%
rename from GUI/CommonWidgets/ItemComboWidget.cpp
rename to GUI/Widgets/Common/ItemComboWidget.cpp
index 2c2d5d7fa3bbd23a092d35fd7fcee3c450a00def..47aa0f18d6367d4941bfd816cf04d18c12cbf7b0 100644
--- a/GUI/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/Widgets/Common/ItemComboWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemComboWidget.cpp
+//! @file GUI/Widgets/Common/ItemComboWidget.cpp
//! @brief Implements class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/ItemComboWidget.h"
+#include "GUI/Widgets/Common/ItemComboWidget.h"
#include "Base/Utils/Assert.h"
-#include "GUI/CommonWidgets/ItemComboToolBar.h"
+#include "GUI/Widgets/Common/ItemComboToolBar.h"
#include <QComboBox>
#include <QEvent>
#include <QStackedWidget>
diff --git a/GUI/CommonWidgets/ItemComboWidget.h b/GUI/Widgets/Common/ItemComboWidget.h
similarity index 90%
rename from GUI/CommonWidgets/ItemComboWidget.h
rename to GUI/Widgets/Common/ItemComboWidget.h
index 7b1a7b98f252e6e96dcace8ee0e044d4533ad822..7ccf6d2f45c6b2bb0393d0a8630f6e5d29d7a1e0 100644
--- a/GUI/CommonWidgets/ItemComboWidget.h
+++ b/GUI/Widgets/Common/ItemComboWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemComboWidget.h
+//! @file GUI/Widgets/Common/ItemComboWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOWIDGET_H
#include "Base/Utils/IFactory.h"
-#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include <QMap>
#include <QString>
#include <QWidget>
@@ -72,4 +72,4 @@ private:
QWidget* m_blankWidget;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOWIDGET_H
diff --git a/GUI/CommonWidgets/ItemSelectorWidget.cpp b/GUI/Widgets/Common/ItemSelectorWidget.cpp
similarity index 97%
rename from GUI/CommonWidgets/ItemSelectorWidget.cpp
rename to GUI/Widgets/Common/ItemSelectorWidget.cpp
index 34ec83badf94398b747f441dcb059bedaeb3935f..faf4a3bec9ab5c47e93ad9ec17c128f0a7d912f6 100644
--- a/GUI/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/Widgets/Common/ItemSelectorWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemSelectorWidget.cpp
+//! @file GUI/Widgets/Common/ItemSelectorWidget.cpp
//! @brief Implements class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/ItemSelectorWidget.h"
+#include "GUI/Widgets/Common/ItemSelectorWidget.h"
#include "GUI/Items/SessionDecorationModel.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/CommonWidgets/ItemSelectorWidget.h b/GUI/Widgets/Common/ItemSelectorWidget.h
similarity index 89%
rename from GUI/CommonWidgets/ItemSelectorWidget.h
rename to GUI/Widgets/Common/ItemSelectorWidget.h
index fec70430b0fac176b10a115bf58cf56a2c038909..48058edfc8b1de705c7fca21ba4346db3f7e333b 100644
--- a/GUI/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/Widgets/Common/ItemSelectorWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemSelectorWidget.h
+//! @file GUI/Widgets/Common/ItemSelectorWidget.h
//! @brief Defines class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSELECTORWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSELECTORWIDGET_H
#include <QItemSelectionModel>
#include <QWidget>
@@ -69,4 +69,4 @@ protected:
std::unique_ptr<SessionDecorationModel> m_decorationModel;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSELECTORWIDGET_H
diff --git a/GUI/CommonWidgets/ItemStackPresenter.h b/GUI/Widgets/Common/ItemStackPresenter.h
similarity index 92%
rename from GUI/CommonWidgets/ItemStackPresenter.h
rename to GUI/Widgets/Common/ItemStackPresenter.h
index e1c34127539aa43344baa4e609b8ac4ea20aaab0..738638d9a9910ff7839c893a0dba8e4215a346e8 100644
--- a/GUI/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/Widgets/Common/ItemStackPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemStackPresenter.h
+//! @file GUI/Widgets/Common/ItemStackPresenter.h
//! @brief Defines class ItemStackPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKPRESENTER_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKPRESENTER_H
#include "Base/Utils/Assert.h"
-#include "GUI/CommonWidgets/ItemStackWidget.h"
+#include "GUI/Widgets/Common/ItemStackWidget.h"
#include <QMap>
#include <QStackedWidget>
@@ -132,4 +132,4 @@ template <class T> void ItemStackPresenter<T>::removeWidgets()
m_itemToWidget.clear();
}
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKPRESENTER_H
diff --git a/GUI/CommonWidgets/ItemStackWidget.cpp b/GUI/Widgets/Common/ItemStackWidget.cpp
similarity index 96%
rename from GUI/CommonWidgets/ItemStackWidget.cpp
rename to GUI/Widgets/Common/ItemStackWidget.cpp
index e66ee7f0fecc17ab635f0d03b92f148c3330b676..56d8ae3af33932cc65e0464bf87611c66ed2d7ad 100644
--- a/GUI/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/Widgets/Common/ItemStackWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemStackWidget.cpp
+//! @file GUI/Widgets/Common/ItemStackWidget.cpp
//! @brief Implements class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/ItemStackWidget.h"
+#include "GUI/Widgets/Common/ItemStackWidget.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/utils/Error.h"
#include <QStackedWidget>
diff --git a/GUI/CommonWidgets/ItemStackWidget.h b/GUI/Widgets/Common/ItemStackWidget.h
similarity index 88%
rename from GUI/CommonWidgets/ItemStackWidget.h
rename to GUI/Widgets/Common/ItemStackWidget.h
index b0c69681ffdc59d0c520435d3f8f53191f46248b..6746142d6d65e9139049113659cb2ff35dda2b70 100644
--- a/GUI/CommonWidgets/ItemStackWidget.h
+++ b/GUI/Widgets/Common/ItemStackWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemStackWidget.h
+//! @file GUI/Widgets/Common/ItemStackWidget.h
//! @brief Defines class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKWIDGET_H
#include <QWidget>
@@ -56,4 +56,4 @@ protected:
QSize m_size_hint;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKWIDGET_H
diff --git a/GUI/CommonWidgets/ItemViewOverlayButtons.cpp b/GUI/Widgets/Common/ItemViewOverlayButtons.cpp
similarity index 99%
rename from GUI/CommonWidgets/ItemViewOverlayButtons.cpp
rename to GUI/Widgets/Common/ItemViewOverlayButtons.cpp
index c375da67efdfdb5eea93bf7ab6e574cdde219dc6..553717f99935f47058647af1ded97a15cedd48fb 100644
--- a/GUI/CommonWidgets/ItemViewOverlayButtons.cpp
+++ b/GUI/Widgets/Common/ItemViewOverlayButtons.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemViewOverlayButtons.cpp
+//! @file GUI/Widgets/Common/ItemViewOverlayButtons.cpp
//! @brief Implements class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/CommonWidgets/ItemViewOverlayButtons.h b/GUI/Widgets/Common/ItemViewOverlayButtons.h
similarity index 82%
rename from GUI/CommonWidgets/ItemViewOverlayButtons.h
rename to GUI/Widgets/Common/ItemViewOverlayButtons.h
index 214ce41b33037f360a24d0bb955d636fd8dd427a..516a91494162b0e97467679080f05e2458edd8db 100644
--- a/GUI/CommonWidgets/ItemViewOverlayButtons.h
+++ b/GUI/Widgets/Common/ItemViewOverlayButtons.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ItemViewOverlayButtons.h
+//! @file GUI/Widgets/Common/ItemViewOverlayButtons.h
//! @brief Defines class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMVIEWOVERLAYBUTTONS_H
#include <QObject>
#include <functional>
@@ -42,4 +42,4 @@ private:
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMVIEWOVERLAYBUTTONS_H
diff --git a/GUI/CommonWidgets/ModelTreeView.cpp b/GUI/Widgets/Common/ModelTreeView.cpp
similarity index 93%
rename from GUI/CommonWidgets/ModelTreeView.cpp
rename to GUI/Widgets/Common/ModelTreeView.cpp
index 2b9f0a4b2bd3d2e01f743826cc0056a3fc435663..84e12521ec8809c32e63e0416afd7b2aea1e280c 100644
--- a/GUI/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/Widgets/Common/ModelTreeView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ModelTreeView.cpp
+//! @file GUI/Widgets/Common/ModelTreeView.cpp
//! @brief Implements class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/ModelTreeView.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/ModelTreeView.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/SessionDecorationModel.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/CommonWidgets/ModelTreeView.h b/GUI/Widgets/Common/ModelTreeView.h
similarity index 85%
rename from GUI/CommonWidgets/ModelTreeView.h
rename to GUI/Widgets/Common/ModelTreeView.h
index d28fcd58e69cd256e66c102dacbfc30835ec640f..b8bb02a8ea3076901218650e2cbcde187d8a1e5d 100644
--- a/GUI/CommonWidgets/ModelTreeView.h
+++ b/GUI/Widgets/Common/ModelTreeView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ModelTreeView.h
+//! @file GUI/Widgets/Common/ModelTreeView.h
//! @brief Defines class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_MODELTREEVIEW_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_MODELTREEVIEW_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
bool m_is_expanded;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_MODELTREEVIEW_H
diff --git a/GUI/CommonWidgets/ScientificSpinBox.cpp b/GUI/Widgets/Common/ScientificSpinBox.cpp
similarity index 97%
rename from GUI/CommonWidgets/ScientificSpinBox.cpp
rename to GUI/Widgets/Common/ScientificSpinBox.cpp
index 8eab7b326ad8fe0144d6475c01be626e77733493..1d32dee443f2ac96b288351bde8ac3ff95bffd28 100644
--- a/GUI/CommonWidgets/ScientificSpinBox.cpp
+++ b/GUI/Widgets/Common/ScientificSpinBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ScientificSpinBox.cpp
+//! @file GUI/Widgets/Common/ScientificSpinBox.cpp
//! @brief Implements class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QLineEdit>
#include <cmath>
diff --git a/GUI/CommonWidgets/ScientificSpinBox.h b/GUI/Widgets/Common/ScientificSpinBox.h
similarity index 89%
rename from GUI/CommonWidgets/ScientificSpinBox.h
rename to GUI/Widgets/Common/ScientificSpinBox.h
index 9d8c19bc0d135fdb0bf06571bd1e31f8374695d4..b5051d01a69627f827bef105496fc35f82d0a331 100644
--- a/GUI/CommonWidgets/ScientificSpinBox.h
+++ b/GUI/Widgets/Common/ScientificSpinBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/ScientificSpinBox.h
+//! @file GUI/Widgets/Common/ScientificSpinBox.h
//! @brief Defines class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_SCIENTIFICSPINBOX_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_SCIENTIFICSPINBOX_H
#include <QAbstractSpinBox>
@@ -66,4 +66,4 @@ private:
QDoubleValidator m_validator;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_SCIENTIFICSPINBOX_H
diff --git a/GUI/CommonWidgets/SessionItemController.cpp b/GUI/Widgets/Common/SessionItemController.cpp
similarity index 95%
rename from GUI/CommonWidgets/SessionItemController.cpp
rename to GUI/Widgets/Common/SessionItemController.cpp
index 04e05349385d55d80242ab177ad5af9ba56bc875..cd91ec869176bd67f3f97098ac37281444cffd47 100644
--- a/GUI/CommonWidgets/SessionItemController.cpp
+++ b/GUI/Widgets/Common/SessionItemController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/SessionItemController.cpp
+//! @file GUI/Widgets/Common/SessionItemController.cpp
//! @brief Implements class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/SessionItemController.h"
+#include "GUI/Widgets/Common/SessionItemController.h"
#include "GUI/Items/SessionItem.h"
SessionItemController::SessionItemController(QObject* prt)
diff --git a/GUI/CommonWidgets/SessionItemController.h b/GUI/Widgets/Common/SessionItemController.h
similarity index 85%
rename from GUI/CommonWidgets/SessionItemController.h
rename to GUI/Widgets/Common/SessionItemController.h
index bf374a8f484f9f41fefe886c0ab45e7b80d05072..8429451d963057c1c78ae851429778b36bcf4df6 100644
--- a/GUI/CommonWidgets/SessionItemController.h
+++ b/GUI/Widgets/Common/SessionItemController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/SessionItemController.h
+//! @file GUI/Widgets/Common/SessionItemController.h
//! @brief Defines class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMCONTROLLER_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMCONTROLLER_H
#include <QObject>
#include <functional>
@@ -53,4 +53,4 @@ private:
bool m_parent_subscribed;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMCONTROLLER_H
diff --git a/GUI/CommonWidgets/SessionItemWidget.cpp b/GUI/Widgets/Common/SessionItemWidget.cpp
similarity index 90%
rename from GUI/CommonWidgets/SessionItemWidget.cpp
rename to GUI/Widgets/Common/SessionItemWidget.cpp
index 2dc7bae07e2917d70bb7b6b3ebe56d23cda4c896..d152718fe83a6c577f575d0424bb99c26765b541 100644
--- a/GUI/CommonWidgets/SessionItemWidget.cpp
+++ b/GUI/Widgets/Common/SessionItemWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/SessionItemWidget.cpp
+//! @file GUI/Widgets/Common/SessionItemWidget.cpp
//! @brief Declares class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/SessionItemWidget.h"
-#include "GUI/CommonWidgets/SessionItemController.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
+#include "GUI/Widgets/Common/SessionItemController.h"
SessionItemWidget::SessionItemWidget(QWidget* parent)
: QWidget(parent), m_itemController(new SessionItemController(this))
diff --git a/GUI/CommonWidgets/SessionItemWidget.h b/GUI/Widgets/Common/SessionItemWidget.h
similarity index 86%
rename from GUI/CommonWidgets/SessionItemWidget.h
rename to GUI/Widgets/Common/SessionItemWidget.h
index 10ada37065847f33b2013a0a2c74cd3c10cd13d3..b7aa5f82773ecc47f938eae401a0353617562f5d 100644
--- a/GUI/CommonWidgets/SessionItemWidget.h
+++ b/GUI/Widgets/Common/SessionItemWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/SessionItemWidget.h
+//! @file GUI/Widgets/Common/SessionItemWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
SessionItemController* m_itemController;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMWIDGET_H
diff --git a/GUI/CommonWidgets/StatusLabel.cpp b/GUI/Widgets/Common/StatusLabel.cpp
similarity index 92%
rename from GUI/CommonWidgets/StatusLabel.cpp
rename to GUI/Widgets/Common/StatusLabel.cpp
index a908dfbc152a12eddd2facfad415594937251fa7..15f7151ad83b636a3195b2c9e560c765fb321920 100644
--- a/GUI/CommonWidgets/StatusLabel.cpp
+++ b/GUI/Widgets/Common/StatusLabel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/StatusLabel.cpp
+//! @file GUI/Widgets/Common/StatusLabel.cpp
//! @brief Implements class StatusLabel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/StatusLabel.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StatusLabel.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/CommonWidgets/StatusLabel.h b/GUI/Widgets/Common/StatusLabel.h
similarity index 86%
rename from GUI/CommonWidgets/StatusLabel.h
rename to GUI/Widgets/Common/StatusLabel.h
index 1dfa6cdc5dcf6f9b8db2ef967853378a5c0ae09b..21f8de2e14ee5ecc99f428e776f504a82a1f9004 100644
--- a/GUI/CommonWidgets/StatusLabel.h
+++ b/GUI/Widgets/Common/StatusLabel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/StatusLabel.h
+//! @file GUI/Widgets/Common/StatusLabel.h
//! @brief Defines class StatusLabel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_STATUSLABEL_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_STATUSLABEL_H
#include <QFrame>
@@ -45,4 +45,4 @@ private:
QFont m_font;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_STATUSLABEL_H
diff --git a/GUI/CommonWidgets/StyleUtils.cpp b/GUI/Widgets/Common/StyleUtils.cpp
similarity index 95%
rename from GUI/CommonWidgets/StyleUtils.cpp
rename to GUI/Widgets/Common/StyleUtils.cpp
index c663c8ed0266f30e51725b1d026ead5d2a2e5a6b..39bfe5f8a6829ac3ce6b97e070d3c82da632ad39 100644
--- a/GUI/CommonWidgets/StyleUtils.cpp
+++ b/GUI/Widgets/Common/StyleUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/StyleUtils.cpp
+//! @file GUI/Widgets/Common/StyleUtils.cpp
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "Base/Utils/Assert.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/detailswidget.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/detailswidget.h"
#include "GUI/utils/hostosinfo.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/CommonWidgets/StyleUtils.h b/GUI/Widgets/Common/StyleUtils.h
similarity index 89%
rename from GUI/CommonWidgets/StyleUtils.h
rename to GUI/Widgets/Common/StyleUtils.h
index 19dbfc51fa3cba300a0f81e40ea4e1b2ac42a26d..c679f193c3ef6c094b5538df10374ead1c7bded0 100644
--- a/GUI/CommonWidgets/StyleUtils.h
+++ b/GUI/Widgets/Common/StyleUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/StyleUtils.h
+//! @file GUI/Widgets/Common/StyleUtils.h
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_STYLEUTILS_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_STYLEUTILS_H
#include <QFont>
#include <QString>
@@ -58,4 +58,4 @@ int PropertyPanelWidth();
} // namespace GUI::Utils::Style
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_STYLEUTILS_H
diff --git a/GUI/CommonWidgets/StyledToolBar.cpp b/GUI/Widgets/Common/StyledToolBar.cpp
similarity index 93%
rename from GUI/CommonWidgets/StyledToolBar.cpp
rename to GUI/Widgets/Common/StyledToolBar.cpp
index 2a0534136c23a2f10bb24da1d45ea3e44efaeda7..d0d109391a732315a0e8e252d846b1f5852264cf 100644
--- a/GUI/CommonWidgets/StyledToolBar.cpp
+++ b/GUI/Widgets/Common/StyledToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/StyledToolBar.cpp
+//! @file GUI/Widgets/Common/StyledToolBar.cpp
//! @brief Implements class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include <QLabel>
#include <QStyle>
diff --git a/GUI/CommonWidgets/StyledToolBar.h b/GUI/Widgets/Common/StyledToolBar.h
similarity index 81%
rename from GUI/CommonWidgets/StyledToolBar.h
rename to GUI/Widgets/Common/StyledToolBar.h
index c18bd6553389d5e3bf71c9d633c091d4ec184a3b..a75707c8715effb0c2eda4101bcd336a11a899d2 100644
--- a/GUI/CommonWidgets/StyledToolBar.h
+++ b/GUI/Widgets/Common/StyledToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/StyledToolBar.h
+//! @file GUI/Widgets/Common/StyledToolBar.h
//! @brief Defines class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_STYLEDTOOLBAR_H
diff --git a/GUI/CommonWidgets/UpdateTimer.cpp b/GUI/Widgets/Common/UpdateTimer.cpp
similarity index 94%
rename from GUI/CommonWidgets/UpdateTimer.cpp
rename to GUI/Widgets/Common/UpdateTimer.cpp
index 993e466644c1971a02ca963c9b28ad439059203a..122f931e710fa5aff97857ed5b19a10de44b4a38 100644
--- a/GUI/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/Widgets/Common/UpdateTimer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/UpdateTimer.cpp
+//! @file GUI/Widgets/Common/UpdateTimer.cpp
//! @brief Implements class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include <QTimer>
UpdateTimer::UpdateTimer(int timerInterval, QObject* parent)
diff --git a/GUI/CommonWidgets/UpdateTimer.h b/GUI/Widgets/Common/UpdateTimer.h
similarity index 86%
rename from GUI/CommonWidgets/UpdateTimer.h
rename to GUI/Widgets/Common/UpdateTimer.h
index 3ec2c37eb76e0069bd93ae3b469f4d33c6856283..fd16d71a82da612f818716b58d402f3c42b16fe2 100644
--- a/GUI/CommonWidgets/UpdateTimer.h
+++ b/GUI/Widgets/Common/UpdateTimer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/CommonWidgets/UpdateTimer.h
+//! @file GUI/Widgets/Common/UpdateTimer.h
//! @brief Defines class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_UPDATETIMER_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_UPDATETIMER_H
#include <QObject>
@@ -49,4 +49,4 @@ private:
QTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_UPDATETIMER_H
diff --git a/GUI/CommonWidgets/detailsbutton.cpp b/GUI/Widgets/Common/detailsbutton.cpp
similarity index 99%
rename from GUI/CommonWidgets/detailsbutton.cpp
rename to GUI/Widgets/Common/detailsbutton.cpp
index 47be284545c0a2fdd9c02f0413add8f261e4e962..90408e29563fd1b215167978afebc2e4c41690b8 100644
--- a/GUI/CommonWidgets/detailsbutton.cpp
+++ b/GUI/Widgets/Common/detailsbutton.cpp
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "GUI/CommonWidgets/detailsbutton.h"
+#include "GUI/Widgets/Common/detailsbutton.h"
#include "GUI/utils/hostosinfo.h"
#include <QGraphicsOpacityEffect>
diff --git a/GUI/CommonWidgets/detailsbutton.h b/GUI/Widgets/Common/detailsbutton.h
similarity index 93%
rename from GUI/CommonWidgets/detailsbutton.h
rename to GUI/Widgets/Common/detailsbutton.h
index bd0a5785d386f4be33380b49a8a1b4d1a69aec5d..ea9d586dd6149ce2415d62cb4f041b1561591213 100644
--- a/GUI/CommonWidgets/detailsbutton.h
+++ b/GUI/Widgets/Common/detailsbutton.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSBUTTON_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSBUTTON_H
#include <QAbstractButton>
@@ -81,4 +81,4 @@ private:
} // namespace GUI::Utils
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSBUTTON_H
diff --git a/GUI/CommonWidgets/detailswidget.cpp b/GUI/Widgets/Common/detailswidget.cpp
similarity index 99%
rename from GUI/CommonWidgets/detailswidget.cpp
rename to GUI/Widgets/Common/detailswidget.cpp
index 1400df00c5a2933d45bf5cd1c2a17c0348aff693..233ae82c9acfbe3b2a90b3532357dd781a610cb0 100644
--- a/GUI/CommonWidgets/detailswidget.cpp
+++ b/GUI/Widgets/Common/detailswidget.cpp
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#include "GUI/CommonWidgets/detailswidget.h"
-#include "GUI/CommonWidgets/detailsbutton.h"
+#include "GUI/Widgets/Common/detailswidget.h"
+#include "GUI/Widgets/Common/detailsbutton.h"
#include "GUI/utils/hostosinfo.h"
#include <QApplication>
diff --git a/GUI/CommonWidgets/detailswidget.h b/GUI/Widgets/Common/detailswidget.h
similarity index 94%
rename from GUI/CommonWidgets/detailswidget.h
rename to GUI/Widgets/Common/detailswidget.h
index c50eaaa0e783e7065defd6df7cd8dc0de36b8b46..cdf255fc91252371bab14ad8a4666f13da5ce83f 100644
--- a/GUI/CommonWidgets/detailswidget.h
+++ b/GUI/Widgets/Common/detailswidget.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSWIDGET_H
#include <QWidget>
@@ -95,4 +95,4 @@ private:
} // namespace GUI::Utils
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSWIDGET_H
diff --git a/GUI/InfoWidgets/CautionSign.cpp b/GUI/Widgets/Info/CautionSign.cpp
similarity index 95%
rename from GUI/InfoWidgets/CautionSign.cpp
rename to GUI/Widgets/Info/CautionSign.cpp
index 0652c1c5d9331ffc90a23fb62e1b5eecbe49ba45..35c940ef64a5359f2d7295ed4a816b9436750cc5 100644
--- a/GUI/InfoWidgets/CautionSign.cpp
+++ b/GUI/Widgets/Info/CautionSign.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/CautionSign.cpp
+//! @file GUI/Widgets/Info/CautionSign.cpp
//! @brief Implements class CautionSign
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "Base/Utils/Assert.h"
-#include "GUI/InfoWidgets/CautionSignWidget.h"
+#include "GUI/Widgets/Info/CautionSignWidget.h"
#include <QAbstractScrollArea>
#include <QEvent>
#include <QScrollBar>
diff --git a/GUI/InfoWidgets/CautionSign.h b/GUI/Widgets/Info/CautionSign.h
similarity index 86%
rename from GUI/InfoWidgets/CautionSign.h
rename to GUI/Widgets/Info/CautionSign.h
index 77ffe176d5c949086e870eb540bb34c64470af09..48d1454e2d914e5ae9588af2b36e189d2a4dc8cc 100644
--- a/GUI/InfoWidgets/CautionSign.h
+++ b/GUI/Widgets/Info/CautionSign.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/CautionSign.h
+//! @file GUI/Widgets/Info/CautionSign.h
//! @brief Defines class CautionSign
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
-#define BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGN_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGN_H
#include <QObject>
@@ -50,4 +50,4 @@ private:
bool m_clear_just_had_happened;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGN_H
diff --git a/GUI/InfoWidgets/CautionSignWidget.cpp b/GUI/Widgets/Info/CautionSignWidget.cpp
similarity index 94%
rename from GUI/InfoWidgets/CautionSignWidget.cpp
rename to GUI/Widgets/Info/CautionSignWidget.cpp
index 6b071e9e23b41953c8c0de0cdce349fdd20c3b1c..749ef1aad1fdb09b7d1ebc7dfc07e1f1f03baea7 100644
--- a/GUI/InfoWidgets/CautionSignWidget.cpp
+++ b/GUI/Widgets/Info/CautionSignWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/CautionSignWidget.cpp
+//! @file GUI/Widgets/Info/CautionSignWidget.cpp
//! @brief Implements class CautionSignWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/CautionSignWidget.h"
+#include "GUI/Widgets/Info/CautionSignWidget.h"
#include <QMessageBox>
#include <QPainter>
#include <QRect>
diff --git a/GUI/InfoWidgets/CautionSignWidget.h b/GUI/Widgets/Info/CautionSignWidget.h
similarity index 84%
rename from GUI/InfoWidgets/CautionSignWidget.h
rename to GUI/Widgets/Info/CautionSignWidget.h
index 450f52b633ecbaf487d228d5ea4ed231e8ba8a99..97167fe055e1599aa28301f8b8fe88d83becad1b 100644
--- a/GUI/InfoWidgets/CautionSignWidget.h
+++ b/GUI/Widgets/Info/CautionSignWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/CautionSignWidget.h
+//! @file GUI/Widgets/Info/CautionSignWidget.h
//! @brief Defines class CautionSignWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
-#define BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGNWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGNWIDGET_H
#include <QPixmap>
#include <QString>
@@ -40,4 +40,4 @@ private:
QString m_caution_message;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGNWIDGET_H
diff --git a/GUI/InfoWidgets/ComboSelectorDialog.cpp b/GUI/Widgets/Info/ComboSelectorDialog.cpp
similarity index 97%
rename from GUI/InfoWidgets/ComboSelectorDialog.cpp
rename to GUI/Widgets/Info/ComboSelectorDialog.cpp
index f5a4a12d2e10b678c345f200af354c1ab0de0646..b734fb9d7bc4d35f1b1448efea961c47090c7875 100644
--- a/GUI/InfoWidgets/ComboSelectorDialog.cpp
+++ b/GUI/Widgets/Info/ComboSelectorDialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/ComboSelectorDialog.cpp
+//! @file GUI/Widgets/Info/ComboSelectorDialog.cpp
//! @brief Implements class ComboSelectorDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/ComboSelectorDialog.h"
+#include "GUI/Widgets/Info/ComboSelectorDialog.h"
#include <QApplication> // qApp
#include <QComboBox>
#include <QLabel>
diff --git a/GUI/InfoWidgets/ComboSelectorDialog.h b/GUI/Widgets/Info/ComboSelectorDialog.h
similarity index 84%
rename from GUI/InfoWidgets/ComboSelectorDialog.h
rename to GUI/Widgets/Info/ComboSelectorDialog.h
index 6412cee18759a6e34794bed09ac9b85639cf17b3..d92f14ebd6007852e086f131472ef06671b67cd9 100644
--- a/GUI/InfoWidgets/ComboSelectorDialog.h
+++ b/GUI/Widgets/Info/ComboSelectorDialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/ComboSelectorDialog.h
+//! @file GUI/Widgets/Info/ComboSelectorDialog.h
//! @brief Defines class ComboSelectorDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
-#define BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_COMBOSELECTORDIALOG_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_COMBOSELECTORDIALOG_H
#include <QDialog>
#include <QString>
@@ -45,4 +45,4 @@ private:
QLabel* m_bottomLabel;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_COMBOSELECTORDIALOG_H
diff --git a/GUI/InfoWidgets/DetailedMessageBox.cpp b/GUI/Widgets/Info/DetailedMessageBox.cpp
similarity index 96%
rename from GUI/InfoWidgets/DetailedMessageBox.cpp
rename to GUI/Widgets/Info/DetailedMessageBox.cpp
index 57b8d7997db733db9f9d8bcd6b59cdade11f51a4..2717fdda49065e57a60a2f967846132b4997062d 100644
--- a/GUI/InfoWidgets/DetailedMessageBox.cpp
+++ b/GUI/Widgets/Info/DetailedMessageBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/DetailedMessageBox.cpp
+//! @file GUI/Widgets/Info/DetailedMessageBox.cpp
//! @brief Implements class DetailedMessageBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/Widgets/Info/DetailedMessageBox.h"
#include <QApplication>
#include <QLabel>
#include <QMessageBox>
diff --git a/GUI/InfoWidgets/DetailedMessageBox.h b/GUI/Widgets/Info/DetailedMessageBox.h
similarity index 85%
rename from GUI/InfoWidgets/DetailedMessageBox.h
rename to GUI/Widgets/Info/DetailedMessageBox.h
index 8088fdaded5f26918e67d82a42fa8eb64b1bd268..7980d541a39d7f276604c23fcebc2a95e6d9e0bf 100644
--- a/GUI/InfoWidgets/DetailedMessageBox.h
+++ b/GUI/Widgets/Info/DetailedMessageBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/DetailedMessageBox.h
+//! @file GUI/Widgets/Info/DetailedMessageBox.h
//! @brief Defines class DetailedMessageBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
-#define BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_DETAILEDMESSAGEBOX_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_DETAILEDMESSAGEBOX_H
#include <QDialog>
#include <QString>
@@ -43,4 +43,4 @@ private:
QTextEdit* m_textEdit;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_DETAILEDMESSAGEBOX_H
diff --git a/GUI/InfoWidgets/OverlayLabelController.cpp b/GUI/Widgets/Info/OverlayLabelController.cpp
similarity index 91%
rename from GUI/InfoWidgets/OverlayLabelController.cpp
rename to GUI/Widgets/Info/OverlayLabelController.cpp
index 7d2561c360efff69850eab8ef9cc57f64343d083..17ab99b3b611e2b615884e982443bfcd3f2d0df8 100644
--- a/GUI/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/Widgets/Info/OverlayLabelController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/OverlayLabelController.cpp
+//! @file GUI/Widgets/Info/OverlayLabelController.cpp
//! @brief Implements class OverlayLabelController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/OverlayLabelController.h"
+#include "GUI/Widgets/Info/OverlayLabelController.h"
#include "Base/Utils/Assert.h"
-#include "GUI/InfoWidgets/OverlayLabelWidget.h"
+#include "GUI/Widgets/Info/OverlayLabelWidget.h"
#include <QAbstractScrollArea>
#include <QEvent>
#include <QRect>
diff --git a/GUI/InfoWidgets/OverlayLabelController.h b/GUI/Widgets/Info/OverlayLabelController.h
similarity index 83%
rename from GUI/InfoWidgets/OverlayLabelController.h
rename to GUI/Widgets/Info/OverlayLabelController.h
index d4666b60fa4123709f3e3057557c002f973455e8..7dd499b31b0d529e2cda275b83e0f835a5aa7740 100644
--- a/GUI/InfoWidgets/OverlayLabelController.h
+++ b/GUI/Widgets/Info/OverlayLabelController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/OverlayLabelController.h
+//! @file GUI/Widgets/Info/OverlayLabelController.h
//! @brief Defines class OverlayLabelController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
-#define BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELCONTROLLER_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELCONTROLLER_H
#include <QObject>
#include <QString>
@@ -46,4 +46,4 @@ private:
QString m_text;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELCONTROLLER_H
diff --git a/GUI/InfoWidgets/OverlayLabelWidget.cpp b/GUI/Widgets/Info/OverlayLabelWidget.cpp
similarity index 88%
rename from GUI/InfoWidgets/OverlayLabelWidget.cpp
rename to GUI/Widgets/Info/OverlayLabelWidget.cpp
index 5c68537ed6c67c53b36b9d20b54393a4c989984d..08697582a166471410aca20f1b95de71af1b628a 100644
--- a/GUI/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/Widgets/Info/OverlayLabelWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/OverlayLabelWidget.cpp
+//! @file GUI/Widgets/Info/OverlayLabelWidget.cpp
//! @brief Implements class OverlayLabelWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/OverlayLabelWidget.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Widgets/Info/OverlayLabelWidget.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/InfoWidgets/OverlayLabelWidget.h b/GUI/Widgets/Info/OverlayLabelWidget.h
similarity index 83%
rename from GUI/InfoWidgets/OverlayLabelWidget.h
rename to GUI/Widgets/Info/OverlayLabelWidget.h
index 160e333969c0097d493b514cecb93b0f3d5b6e39..f58beae6559a49aa9c83b89c2172c1806893cd25 100644
--- a/GUI/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/Widgets/Info/OverlayLabelWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/OverlayLabelWidget.h
+//! @file GUI/Widgets/Info/OverlayLabelWidget.h
//! @brief Defines class OverlayLabelWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
-#define BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELWIDGET_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELWIDGET_H
#include <QRect>
#include <QString>
@@ -40,4 +40,4 @@ private:
QRect m_bounding_rect;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELWIDGET_H
diff --git a/GUI/InfoWidgets/ProjectLoadProblemDialog.cpp b/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
similarity index 96%
rename from GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
rename to GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
index 51bc90204d464b9b2fb2a2136c24ee60eaf1d4d6..033ce63c8a32bef99ec1427deba8160c7132cd72 100644
--- a/GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
+++ b/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
+//! @file GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
//! @brief Implements class ProjectLoadProblemDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/utils/Helpers.h"
#include <QBoxLayout>
#include <QGridLayout>
diff --git a/GUI/InfoWidgets/ProjectLoadProblemDialog.h b/GUI/Widgets/Info/ProjectLoadProblemDialog.h
similarity index 81%
rename from GUI/InfoWidgets/ProjectLoadProblemDialog.h
rename to GUI/Widgets/Info/ProjectLoadProblemDialog.h
index e8131bc636ec6688c4a2c23dab3f8a8e0cc0bfbb..e15c48f6fb08b34dc81042921ba2e0b71e58474f 100644
--- a/GUI/InfoWidgets/ProjectLoadProblemDialog.h
+++ b/GUI/Widgets/Info/ProjectLoadProblemDialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/ProjectLoadProblemDialog.h
+//! @file GUI/Widgets/Info/ProjectLoadProblemDialog.h
//! @brief Defines class ProjectLoadProblemDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
-#define BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_PROJECTLOADPROBLEMDIALOG_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_PROJECTLOADPROBLEMDIALOG_H
#include <QDialog>
#include <QString>
@@ -34,4 +34,4 @@ private:
QString m_projectDocumentVersion;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_PROJECTLOADPROBLEMDIALOG_H
diff --git a/GUI/InfoWidgets/PythonSyntaxHighlighter.cpp b/GUI/Widgets/Info/PythonSyntaxHighlighter.cpp
similarity index 98%
rename from GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
rename to GUI/Widgets/Info/PythonSyntaxHighlighter.cpp
index 6f871a4b0e0ab91119b76798ec7b896a4571cd15..4409c4c72c5afaa227102bbecf1fb54e69b3fd9f 100644
--- a/GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
+++ b/GUI/Widgets/Info/PythonSyntaxHighlighter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
+//! @file GUI/Widgets/Info/PythonSyntaxHighlighter.cpp
//! @brief Defines class PythonSyntaxHighlighter
//!
//! @homepage http://www.bornagainproject.org
@@ -35,7 +35,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/Widgets/Info/PythonSyntaxHighlighter.h"
PythonSyntaxHighlighter::PythonSyntaxHighlighter(QTextDocument* parent) : QSyntaxHighlighter(parent)
{
diff --git a/GUI/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/Widgets/Info/PythonSyntaxHighlighter.h
similarity index 92%
rename from GUI/InfoWidgets/PythonSyntaxHighlighter.h
rename to GUI/Widgets/Info/PythonSyntaxHighlighter.h
index 18c2fee7761147b4337b12abeebee969f0449647..938142dd5f080c337094825180aaac4ca4fe731c 100644
--- a/GUI/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/Widgets/Info/PythonSyntaxHighlighter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/InfoWidgets/PythonSyntaxHighlighter.h
+//! @file GUI/Widgets/Info/PythonSyntaxHighlighter.h
//! @brief Defines class PythonSyntaxHighlighter
//!
//! @homepage http://www.bornagainproject.org
@@ -35,8 +35,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
-#define BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#ifndef BORNAGAIN_GUI_WIDGETS_INFO_PYTHONSYNTAXHIGHLIGHTER_H
+#define BORNAGAIN_GUI_WIDGETS_INFO_PYTHONSYNTAXHIGHLIGHTER_H
#include <QSyntaxHighlighter>
@@ -86,4 +86,4 @@ private:
QRegExp triDoubleQuote;
};
-#endif // BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#endif // BORNAGAIN_GUI_WIDGETS_INFO_PYTHONSYNTAXHIGHLIGHTER_H
diff --git a/GUI/mainwindow/AutosaveController.cpp b/GUI/mainwindow/AutosaveController.cpp
index 52d4833811910902f360fa430166280764188280..c196767203b6a2f55c2641e34700ada8197d3c48 100644
--- a/GUI/mainwindow/AutosaveController.cpp
+++ b/GUI/mainwindow/AutosaveController.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/projectdocument.h"
#include <QDir>
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index cadb1c69d455df7835bf8bcac7e19d0cd0fa456c..7b7c5b2fde7960f0db0cf4967def00381aa1bfac 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -19,8 +19,8 @@
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/InfoWidgets/ComboSelectorDialog.h"
-#include "GUI/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/Widgets/Info/ComboSelectorDialog.h"
+#include "GUI/Widgets/Info/DetailedMessageBox.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
diff --git a/GUI/mainwindow/aboutapplicationdialog.cpp b/GUI/mainwindow/aboutapplicationdialog.cpp
index 68a34ce957b4ae2c7a72a9e6ef48d664eb8f9f8a..746a5530edda78bb21f0e2ee905e0a00def61c26 100644
--- a/GUI/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/mainwindow/aboutapplicationdialog.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/mainwindow/aboutapplicationdialog.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/utils/CustomEventFilters.h"
#include "GUI/utils/Helpers.h"
#include <QDate>
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/mainwindow/projectmanager.cpp
index 07ec69972bf2e6c4f6808d2515d14b982f1b4bab..a7a824ea6b435996144d16df3d1be807e1988077 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/mainwindow/projectmanager.cpp
@@ -15,7 +15,7 @@
#include "GUI/mainwindow/projectmanager.h"
#include "Base/Utils/Assert.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
+#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/projectdocument.h"
diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
index 2477978f2b960fe183511d6575b0b3ba9816eeb6..c26fb75f7525ebef500695bb72ace35651227fe1 100644
--- a/Tests/Unit/GUI/TestScientificSpinBox.cpp
+++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp
@@ -1,4 +1,4 @@
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Widgets/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 2800db32d7a16b5986716f3f1f2eee88f9d5b504..9d38c75518693b16f6a44c96261e26bef1a2b502 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -1,4 +1,4 @@
-#include "GUI/CommonWidgets/SessionItemController.h"
+#include "GUI/Widgets/Common/SessionItemController.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/SessionModel.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
index 13491b06f9eeb6b52487f31573d70bfeedd62a7a..0df2993c501cae8e6d85f4d329bb8b2c7621ed78 100644
--- a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
+++ b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
@@ -1,5 +1,5 @@
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
-#include "GUI/CommonWidgets/SessionItemController.h"
+#include "GUI/Widgets/Common/SessionItemController.h"
#include "GUI/Items/SessionItem.h"
TestListener::TestListener()
diff --git a/Tests/Unit/GUI/TestUpdateTimer.cpp b/Tests/Unit/GUI/TestUpdateTimer.cpp
index 5a6677f66443a561b95642e3d44c0d67d4b6da2a..93624a886bbfe6d9da0c2f01e7129b6eafa21e3f 100644
--- a/Tests/Unit/GUI/TestUpdateTimer.cpp
+++ b/Tests/Unit/GUI/TestUpdateTimer.cpp
@@ -1,4 +1,4 @@
-#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>