mv 2 dirs under GUI/Widgets; glob in GUI/CMake

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})
 
 # -----------------------------------------------------------------------------

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

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"

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;

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;
 

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;

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"

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"

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;

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"

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;

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;

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;

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"

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"

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"

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"

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"

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"

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"