diff --git a/App/main.cpp b/App/main.cpp index 655213d839b1b8ded8d6b3dc4e6f426a9b2d22cf..a4c8cee37e8a1c527171d1268a89e58187774a48 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -15,9 +15,9 @@ #include "App/AppOptions.h" #include "Base/Util/Assert.h" #include "GUI/Support/Util/Path.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Main/MainWindow.h" #include "GUI/View/Tool/Globals.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "config_build.h" #include <QApplication> #include <QDir> diff --git a/GUI/View/Data/DatafilesSelector.cpp b/GUI/View/Data/DatafilesSelector.cpp index a9a6353fc276e84ba2adc9cb038bddca69e6538d..333d18fd1f89f12747ba3fd6cb0e60d1d4fe0d28 100644 --- a/GUI/View/Data/DatafilesSelector.cpp +++ b/GUI/View/Data/DatafilesSelector.cpp @@ -23,8 +23,8 @@ #include "GUI/View/Data/Legacy1dDialog.h" #include "GUI/View/Info/MessageBox.h" #include "GUI/View/Item/ItemViewOverlayButtons.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Manager/ProjectManager.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QFileDialog> #include <QMenu> #include <QSplitter> diff --git a/GUI/View/Instrument/InstrumentLibraryDialog.cpp b/GUI/View/Instrument/InstrumentLibraryDialog.cpp index 5f1d220950779f5676409dabc1d700192f1e9307..64d71cfada1a6cf5a5ac507a8f7e5d5844bcd8a0 100644 --- a/GUI/View/Instrument/InstrumentLibraryDialog.cpp +++ b/GUI/View/Instrument/InstrumentLibraryDialog.cpp @@ -18,9 +18,9 @@ #include "GUI/Model/Device/InstrumentLibrary.h" #include "GUI/Support/Style/Style.h" #include "GUI/View/Item/ItemViewOverlayButtons.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Tool/ItemDelegateForHTML.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QAction> #include <QFormLayout> #include <QInputDialog> diff --git a/GUI/View/Instrument/InstrumentView.cpp b/GUI/View/Instrument/InstrumentView.cpp index 1e9229ed68a8bacbe7c7e92aea3da6c97ebb2932..28a488279403420e92c579cba2bc8f5f09a0bd94 100644 --- a/GUI/View/Instrument/InstrumentView.cpp +++ b/GUI/View/Instrument/InstrumentView.cpp @@ -20,7 +20,7 @@ #include "GUI/View/Instrument/InstrumentListing.h" #include "GUI/View/Instrument/OffspecInstrumentEditor.h" #include "GUI/View/Instrument/SpecularInstrumentEditor.h" -#include "GUI/View/Widget/ApplicationSettings.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Widget/GroupBoxes.h" #include "GUI/View/Widget/StyledToolbar.h" #include <QFormLayout> diff --git a/GUI/View/Widget/ApplicationSettings.cpp b/GUI/View/Layout/ApplicationSettings.cpp similarity index 96% rename from GUI/View/Widget/ApplicationSettings.cpp rename to GUI/View/Layout/ApplicationSettings.cpp index d4ac6e62633a130ac97a719bf9c8cf9ab5a66324..229e968c058fa4daf79f0d6e3db63ea9a15dd18c 100644 --- a/GUI/View/Widget/ApplicationSettings.cpp +++ b/GUI/View/Layout/ApplicationSettings.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/Widget/ApplicationSettings.cpp +//! @file GUI/View/Layout/ApplicationSettings.cpp //! @brief Implements class ApplicationSettings. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/View/Widget/ApplicationSettings.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "Base/Util/Assert.h" #include <QApplication> #include <QFile> diff --git a/GUI/View/Widget/ApplicationSettings.h b/GUI/View/Layout/ApplicationSettings.h similarity index 83% rename from GUI/View/Widget/ApplicationSettings.h rename to GUI/View/Layout/ApplicationSettings.h index 4820c52f7b6ad3f8876f7fe6a7490e693a2c692b..1dc03ceee08fcd05aae40da6ecf041812c883387 100644 --- a/GUI/View/Widget/ApplicationSettings.h +++ b/GUI/View/Layout/ApplicationSettings.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/Widget/ApplicationSettings.h +//! @file GUI/View/Layout/ApplicationSettings.h //! @brief Defines class ApplicationSettings. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_VIEW_WIDGET_APPLICATIONSETTINGS_H -#define BORNAGAIN_GUI_VIEW_WIDGET_APPLICATIONSETTINGS_H +#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_APPLICATIONSETTINGS_H +#define BORNAGAIN_GUI_VIEW_LAYOUT_APPLICATIONSETTINGS_H #include <QWidget> @@ -35,4 +35,4 @@ public: extern ApplicationSettings* appSettings; //!< global pointer to the single instance -#endif // BORNAGAIN_GUI_VIEW_WIDGET_APPLICATIONSETTINGS_H +#endif // BORNAGAIN_GUI_VIEW_LAYOUT_APPLICATIONSETTINGS_H diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp index da8bb6a7030af755fd3d6761c9eb1fa23011c9f1..6f5d6f0ba29c97e052c4e4a277053fd43a51ab31 100644 --- a/GUI/View/Main/ActionManager.cpp +++ b/GUI/View/Main/ActionManager.cpp @@ -18,12 +18,12 @@ #include "GUI/Support/Util/Path.h" #include "GUI/View/Instrument/InstrumentView.h" #include "GUI/View/Job/JobView.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Main/AboutDialog.h" #include "GUI/View/Main/MainWindow.h" #include "GUI/View/Manager/ProjectManager.h" #include "GUI/View/Sample/SampleView.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QButtonGroup> #include <QCheckBox> #include <QDesktopServices> diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp index 11d8edc2720e7d0be1cf9fcf2c5a873e21747932..ed0418b8e6798cca719f10cdaacf42b09f33d1b1 100644 --- a/GUI/View/Main/MainWindow.cpp +++ b/GUI/View/Main/MainWindow.cpp @@ -18,6 +18,7 @@ #include "GUI/View/Data/DataView.h" #include "GUI/View/Instrument/InstrumentView.h" #include "GUI/View/Job/JobView.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Main/ActionManager.h" #include "GUI/View/Manager/ProjectManager.h" @@ -25,7 +26,6 @@ #include "GUI/View/Project/SimulationView.h" #include "GUI/View/Sample/SampleView.h" #include "GUI/View/Setup/FrameActions.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QAction> #include <QApplication> #include <QCloseEvent> diff --git a/GUI/View/Manager/NewProjectDialog.cpp b/GUI/View/Manager/NewProjectDialog.cpp index fa485a205a73edd0a10bf841533b3a3bcaaa9588..4277bb772f98e3d6053317738d87e4fc2b6ef166 100644 --- a/GUI/View/Manager/NewProjectDialog.cpp +++ b/GUI/View/Manager/NewProjectDialog.cpp @@ -15,7 +15,7 @@ #include "GUI/View/Manager/NewProjectDialog.h" #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Project/ProjectUtil.h" -#include "GUI/View/Widget/ApplicationSettings.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include <QFileDialog> #include <QGroupBox> #include <QPushButton> diff --git a/GUI/View/Manager/ProjectManager.cpp b/GUI/View/Manager/ProjectManager.cpp index 8c80a1c6c36512c4bd1c34b067f3474912189dc2..3fc49212fbb52c8f68ef9ef5cc57655f328e3fc6 100644 --- a/GUI/View/Manager/ProjectManager.cpp +++ b/GUI/View/Manager/ProjectManager.cpp @@ -17,12 +17,12 @@ #include "GUI/Model/Project/ProjectUtil.h" #include "GUI/Support/Util/MessageService.h" #include "GUI/View/Info/MessageBox.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Manager/AutosaveController.h" #include "GUI/View/Manager/NewProjectDialog.h" #include "GUI/View/Manager/ProjectLoadProblemDialog.h" #include "GUI/View/Tool/Globals.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QApplication> #include <QDateTime> #include <QFileDialog> diff --git a/GUI/View/Manager/PyImportAssistant.cpp b/GUI/View/Manager/PyImportAssistant.cpp index dde220b56817f7c7f0079ff48c7304afb1dd50a6..d8d3395b56a1c97b04bb428bc85c7f351a9e4338 100644 --- a/GUI/View/Manager/PyImportAssistant.cpp +++ b/GUI/View/Manager/PyImportAssistant.cpp @@ -26,9 +26,9 @@ #include "GUI/View/Info/ComboSelectorDialog.h" #include "GUI/View/Info/DetailedMessageBox.h" #include "GUI/View/Info/MessageBox.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Manager/ProjectManager.h" #include "GUI/View/Tool/Globals.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "PyCore/Embed/PyInterpreter.h" // listOfFunctions #include "PyCore/Sample/ImportMultiLayer.h" // createMultiLayerFromPython #include "Sample/Multilayer/MultiLayer.h" diff --git a/GUI/View/Material/MaterialEditorDialog.cpp b/GUI/View/Material/MaterialEditorDialog.cpp index 23e4102c3f763790f941c32b90d24bcb6e1dd1d4..b32f5f1ea01d36d53d12eefd9742ec96543eef93 100644 --- a/GUI/View/Material/MaterialEditorDialog.cpp +++ b/GUI/View/Material/MaterialEditorDialog.cpp @@ -18,9 +18,9 @@ #include "GUI/Model/Sample/MaterialModel.h" #include "GUI/Model/Sample/SampleItem.h" #include "GUI/Support/Style/Style.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Material/MaterialTableModel.h" #include "GUI/View/Numeric/DoubleSpinBox.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "GUI/View/Widget/StyledToolbar.h" #include <QAction> #include <QColorDialog> diff --git a/GUI/View/PlotScale/SavePlotAssistant.cpp b/GUI/View/PlotScale/SavePlotAssistant.cpp index f7affd2b8ad3ff25c511cc30d5be4606ae6d4fb5..9e9b6c3bccea231b8e375b5a8c2e98bf39a1b994 100644 --- a/GUI/View/PlotScale/SavePlotAssistant.cpp +++ b/GUI/View/PlotScale/SavePlotAssistant.cpp @@ -15,8 +15,8 @@ #include "GUI/View/PlotScale/SavePlotAssistant.h" #include "Base/Util/Assert.h" #include "Device/IO/IOFactory.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Plotter/ColorMap.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QFileDialog> #include <QMessageBox> #include <QVector> diff --git a/GUI/View/Project/PythonScriptWidget.cpp b/GUI/View/Project/PythonScriptWidget.cpp index ae0b273e70f00c2d0c1628c4580afecf8ba2ab4d..5e44be0aa17da43c362ebfd5ab9b8d2b0ad52471 100644 --- a/GUI/View/Project/PythonScriptWidget.cpp +++ b/GUI/View/Project/PythonScriptWidget.cpp @@ -17,7 +17,7 @@ #include "GUI/Support/Style/Style.h" #include "GUI/View/Info/CautionSign.h" #include "GUI/View/Info/PythonSyntaxHighlighter.h" -#include "GUI/View/Widget/ApplicationSettings.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Widget/StyledToolbar.h" #include "Sim/Export/ExportToPython.h" #include "Sim/Simulation/ScatteringSimulation.h" diff --git a/GUI/View/Realspace/RealspaceWidget.cpp b/GUI/View/Realspace/RealspaceWidget.cpp index 060aa2e4cdf55da237cc8bb0a5e3f4097ba00f62..c7022126071813a6a02d0d20d7cee379cca12058 100644 --- a/GUI/View/Realspace/RealspaceWidget.cpp +++ b/GUI/View/Realspace/RealspaceWidget.cpp @@ -18,8 +18,8 @@ #include "GUI/Model/Sample/MaterialItem.h" #include "GUI/Model/Sample/SampleItem.h" #include "GUI/View/Info/CautionSign.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Realspace/RealspaceBuilder.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "Img3D/Model/Model.h" #include "Img3D/View/Canvas.h" #include <QApplication> diff --git a/GUI/View/Sample/SampleEditor.cpp b/GUI/View/Sample/SampleEditor.cpp index 63a9074d0209fd3e37a786962c89ffa0c5377938..2195b29b80e7d63b1fb26f6216623dc906204d86 100644 --- a/GUI/View/Sample/SampleEditor.cpp +++ b/GUI/View/Sample/SampleEditor.cpp @@ -16,10 +16,10 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Sample/LayerItem.h" #include "GUI/Model/Sample/SampleItem.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Sample/LayerEditorUtil.h" #include "GUI/View/Sample/SampleEditorController.h" #include "GUI/View/Sample/SampleForm.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "GUI/View/Widget/StyledToolbar.h" #include <QActionGroup> #include <QBoxLayout> diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp index b5eb8bd07fb24d721ed5f6485d03580a3faab418..9a96268f335f42ad67c87302ce4e83fc858bf794 100644 --- a/GUI/View/Sample/SampleForm.cpp +++ b/GUI/View/Sample/SampleForm.cpp @@ -14,6 +14,7 @@ #include "GUI/View/Sample/SampleForm.h" #include "GUI/Model/Sample/SampleItem.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Sample/CompoundForm.h" #include "GUI/View/Sample/CoreAndShellForm.h" #include "GUI/View/Sample/HeinzFormLayout.h" @@ -24,7 +25,6 @@ #include "GUI/View/Sample/SampleEditorController.h" #include "GUI/View/Tool/ActionFactory.h" #include "GUI/View/Tool/LayoutUtil.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "GUI/View/Widget/GroupBoxes.h" #include <QBoxLayout> #include <QLabel> diff --git a/GUI/View/Sample/SampleListing.cpp b/GUI/View/Sample/SampleListing.cpp index 6a859484e93257c41d417cb5d7faeab5438b12ff..ff8e0a668d226c77dd43a95f145efaea7242f9fa 100644 --- a/GUI/View/Sample/SampleListing.cpp +++ b/GUI/View/Sample/SampleListing.cpp @@ -18,9 +18,9 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Sample/SampleItem.h" #include "GUI/View/Item/ItemViewOverlayButtons.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Sample/SampleListModel.h" #include "GUI/View/Tool/ItemDelegateForHTML.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include <QAction> #include <QMenu> #include <QPainter> diff --git a/GUI/View/Sample/SampleView.cpp b/GUI/View/Sample/SampleView.cpp index f600f2a6018c5730a59aa8ecff9ad854bb920627..6982ec88b1d90c76357ac25c3256e8265d0dd14f 100644 --- a/GUI/View/Sample/SampleView.cpp +++ b/GUI/View/Sample/SampleView.cpp @@ -18,13 +18,13 @@ #include "GUI/Model/Sample/LayerItem.h" #include "GUI/Model/Sample/ParticleLayoutItem.h" #include "GUI/Model/Sample/SampleItem.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Realspace/RealspacePanel.h" #include "GUI/View/Realspace/RealspaceWidget.h" #include "GUI/View/Sample/SampleEditor.h" #include "GUI/View/Sample/SampleListing.h" #include "GUI/View/Sample/ScriptPanel.h" -#include "GUI/View/Widget/ApplicationSettings.h" #include "GUI/View/Widget/StyledToolbar.h" #include <QBoxLayout> #include <QCheckBox> diff --git a/GUI/View/Setup/ProjectionsSaver.cpp b/GUI/View/Setup/ProjectionsSaver.cpp index 9b33244c09b07ce5ff6a0303c1825ca39d086163..31c127a77c6cf6bf5c9af79bae2eddf434f27d82 100644 --- a/GUI/View/Setup/ProjectionsSaver.cpp +++ b/GUI/View/Setup/ProjectionsSaver.cpp @@ -20,7 +20,7 @@ #include "GUI/Model/Mask/MaskItems.h" #include "GUI/Model/Mask/ProjectionList.h" #include "GUI/Model/Project/ProjectDocument.h" -#include "GUI/View/Widget/ApplicationSettings.h" +#include "GUI/View/Layout/ApplicationSettings.h" #include <QFileDialog> #include <QString> #include <QTextStream>