From 0e0ff1af9bc4ce14991d2107dd078d9074982e95 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Tue, 16 Jan 2024 18:10:43 +0100 Subject: [PATCH] rename GUI/View/Tool/mainwindow_constants.h -> GUI/View/Layout/ --- GUI/View/Data/DataView.cpp | 2 +- GUI/View/Fit/FitActivityPanel.cpp | 2 +- GUI/View/Fit/FitSessionWidget.cpp | 2 +- GUI/View/FitControl/RunFitControlWidget.cpp | 2 +- GUI/View/FitMessage/JobMessagePanel.cpp | 2 +- GUI/View/Instrument/InstrumentLibraryDialog.cpp | 2 +- GUI/View/JobControl/JobPropertiesWidget.cpp | 2 +- GUI/View/JobControl/JobSelector.cpp | 2 +- GUI/View/{Tool => Layout}/mainwindow_constants.h | 8 ++++---- GUI/View/Main/ActionManager.cpp | 2 +- GUI/View/Main/MainWindow.cpp | 2 +- GUI/View/Manager/ProjectManager.cpp | 2 +- GUI/View/Sample/SampleView.cpp | 2 +- GUI/View/Setup/MaskToolbar.cpp | 2 +- GUI/View/Setup/ProjectionToolbar.cpp | 2 +- GUI/View/Tuning/JobRealTimeWidget.cpp | 2 +- GUI/View/Tuning/ParameterTuningWidget.cpp | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) rename GUI/View/{Tool => Layout}/mainwindow_constants.h (92%) diff --git a/GUI/View/Data/DataView.cpp b/GUI/View/Data/DataView.cpp index 702994a5ef7..07c18cc79ec 100644 --- a/GUI/View/Data/DataView.cpp +++ b/GUI/View/Data/DataView.cpp @@ -17,7 +17,7 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/View/Data/DatafilesSelector.h" #include "GUI/View/Data/DatafilesStack.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include <QAction> #include <QSplitter> #include <QVBoxLayout> diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp index 3e84efeb120..3691810d036 100644 --- a/GUI/View/Fit/FitActivityPanel.cpp +++ b/GUI/View/Fit/FitActivityPanel.cpp @@ -19,7 +19,7 @@ #include "GUI/View/Fit/FitSessionManager.h" #include "GUI/View/Fit/FitSessionWidget.h" #include "GUI/View/FitControl/RunFitControlWidget.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Tuning/JobRealTimeWidget.h" #include "GUI/View/Tuning/ParameterTuningWidget.h" #include <QSettings> diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp index d35292db284..700d11b183c 100644 --- a/GUI/View/Fit/FitSessionWidget.cpp +++ b/GUI/View/Fit/FitSessionWidget.cpp @@ -18,7 +18,7 @@ #include "GUI/View/Fit/FitSessionController.h" #include "GUI/View/FitControl/MinimizerSettingsWidget.h" #include "GUI/View/FitControl/RunFitControlWidget.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Tuning/FitParameterWidget.h" #include <QSettings> #include <QVBoxLayout> diff --git a/GUI/View/FitControl/RunFitControlWidget.cpp b/GUI/View/FitControl/RunFitControlWidget.cpp index 2eccaea372a..7df5043b46c 100644 --- a/GUI/View/FitControl/RunFitControlWidget.cpp +++ b/GUI/View/FitControl/RunFitControlWidget.cpp @@ -19,7 +19,7 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Support/Style/Style.h" #include "GUI/View/Info/CautionSign.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include <QHBoxLayout> namespace { diff --git a/GUI/View/FitMessage/JobMessagePanel.cpp b/GUI/View/FitMessage/JobMessagePanel.cpp index 46e6faf4a65..7db26e0c4e4 100644 --- a/GUI/View/FitMessage/JobMessagePanel.cpp +++ b/GUI/View/FitMessage/JobMessagePanel.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/FitMessage/JobMessagePanel.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include <QScrollBar> #include <QSettings> diff --git a/GUI/View/Instrument/InstrumentLibraryDialog.cpp b/GUI/View/Instrument/InstrumentLibraryDialog.cpp index 2aa4f64b3e9..5f1d2209507 100644 --- a/GUI/View/Instrument/InstrumentLibraryDialog.cpp +++ b/GUI/View/Instrument/InstrumentLibraryDialog.cpp @@ -18,8 +18,8 @@ #include "GUI/Model/Device/InstrumentLibrary.h" #include "GUI/Support/Style/Style.h" #include "GUI/View/Item/ItemViewOverlayButtons.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Tool/ItemDelegateForHTML.h" -#include "GUI/View/Tool/mainwindow_constants.h" #include "GUI/View/Widget/ApplicationSettings.h" #include <QAction> #include <QFormLayout> diff --git a/GUI/View/JobControl/JobPropertiesWidget.cpp b/GUI/View/JobControl/JobPropertiesWidget.cpp index f64640a3bbb..e59c09ca2f2 100644 --- a/GUI/View/JobControl/JobPropertiesWidget.cpp +++ b/GUI/View/JobControl/JobPropertiesWidget.cpp @@ -15,7 +15,7 @@ #include "GUI/View/JobControl/JobPropertiesWidget.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/View/JobControl/JobPropertiesTableModel.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include <QHeaderView> #include <QVBoxLayout> diff --git a/GUI/View/JobControl/JobSelector.cpp b/GUI/View/JobControl/JobSelector.cpp index b8a06fd47f7..b10d440e4c5 100644 --- a/GUI/View/JobControl/JobSelector.cpp +++ b/GUI/View/JobControl/JobSelector.cpp @@ -16,7 +16,7 @@ #include "Base/Util/Assert.h" #include "GUI/View/JobControl/JobListing.h" #include "GUI/View/JobControl/JobPropertiesWidget.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include <QVBoxLayout> namespace { diff --git a/GUI/View/Tool/mainwindow_constants.h b/GUI/View/Layout/mainwindow_constants.h similarity index 92% rename from GUI/View/Tool/mainwindow_constants.h rename to GUI/View/Layout/mainwindow_constants.h index 7d9bf7a59d2..494b4b32fa1 100644 --- a/GUI/View/Tool/mainwindow_constants.h +++ b/GUI/View/Layout/mainwindow_constants.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/Tool/mainwindow_constants.h +//! @file GUI/View/Layout/mainwindow_constants.h //! @brief Defines namespace GUI::Style. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H -#define BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H +#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_MAINWINDOW_CONSTANTS_H +#define BORNAGAIN_GUI_VIEW_LAYOUT_MAINWINDOW_CONSTANTS_H #include <QString> @@ -70,4 +70,4 @@ const int toolbar_icon_size = 32; } // namespace GUI::Style -#endif // BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H +#endif // BORNAGAIN_GUI_VIEW_LAYOUT_MAINWINDOW_CONSTANTS_H diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp index 60adff0edbe..da8bb6a7030 100644 --- a/GUI/View/Main/ActionManager.cpp +++ b/GUI/View/Main/ActionManager.cpp @@ -18,11 +18,11 @@ #include "GUI/Support/Util/Path.h" #include "GUI/View/Instrument/InstrumentView.h" #include "GUI/View/Job/JobView.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/Tool/mainwindow_constants.h" #include "GUI/View/Widget/ApplicationSettings.h" #include <QButtonGroup> #include <QCheckBox> diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp index 921ef40e1a2..11d8edc2720 100644 --- a/GUI/View/Main/MainWindow.cpp +++ b/GUI/View/Main/MainWindow.cpp @@ -18,13 +18,13 @@ #include "GUI/View/Data/DataView.h" #include "GUI/View/Instrument/InstrumentView.h" #include "GUI/View/Job/JobView.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Main/ActionManager.h" #include "GUI/View/Manager/ProjectManager.h" #include "GUI/View/Project/ProjectsView.h" #include "GUI/View/Project/SimulationView.h" #include "GUI/View/Sample/SampleView.h" #include "GUI/View/Setup/FrameActions.h" -#include "GUI/View/Tool/mainwindow_constants.h" #include "GUI/View/Widget/ApplicationSettings.h" #include <QAction> #include <QApplication> diff --git a/GUI/View/Manager/ProjectManager.cpp b/GUI/View/Manager/ProjectManager.cpp index e7cfe1049fc..8c80a1c6c36 100644 --- a/GUI/View/Manager/ProjectManager.cpp +++ b/GUI/View/Manager/ProjectManager.cpp @@ -17,11 +17,11 @@ #include "GUI/Model/Project/ProjectUtil.h" #include "GUI/Support/Util/MessageService.h" #include "GUI/View/Info/MessageBox.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/Tool/mainwindow_constants.h" #include "GUI/View/Widget/ApplicationSettings.h" #include <QApplication> #include <QDateTime> diff --git a/GUI/View/Sample/SampleView.cpp b/GUI/View/Sample/SampleView.cpp index da30f2e3de8..f600f2a6018 100644 --- a/GUI/View/Sample/SampleView.cpp +++ b/GUI/View/Sample/SampleView.cpp @@ -18,12 +18,12 @@ #include "GUI/Model/Sample/LayerItem.h" #include "GUI/Model/Sample/ParticleLayoutItem.h" #include "GUI/Model/Sample/SampleItem.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/Tool/mainwindow_constants.h" #include "GUI/View/Widget/ApplicationSettings.h" #include "GUI/View/Widget/StyledToolbar.h" #include <QBoxLayout> diff --git a/GUI/View/Setup/MaskToolbar.cpp b/GUI/View/Setup/MaskToolbar.cpp index 911bfe7b1a0..a590c646369 100644 --- a/GUI/View/Setup/MaskToolbar.cpp +++ b/GUI/View/Setup/MaskToolbar.cpp @@ -14,8 +14,8 @@ #include "GUI/View/Setup/MaskToolbar.h" #include "Base/Util/Assert.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Setup/FrameActions.h" -#include "GUI/View/Tool/mainwindow_constants.h" #include <QLabel> #include <QRadioButton> #include <QStyle> diff --git a/GUI/View/Setup/ProjectionToolbar.cpp b/GUI/View/Setup/ProjectionToolbar.cpp index c1d749c3f65..0a2d43c68b5 100644 --- a/GUI/View/Setup/ProjectionToolbar.cpp +++ b/GUI/View/Setup/ProjectionToolbar.cpp @@ -13,8 +13,8 @@ // ************************************************************************************************ #include "GUI/View/Setup/ProjectionToolbar.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Setup/FrameActions.h" -#include "GUI/View/Tool/mainwindow_constants.h" #include <QLabel> #include <QToolButton> diff --git a/GUI/View/Tuning/JobRealTimeWidget.cpp b/GUI/View/Tuning/JobRealTimeWidget.cpp index 9fa54e24a84..800fbcdc6c7 100644 --- a/GUI/View/Tuning/JobRealTimeWidget.cpp +++ b/GUI/View/Tuning/JobRealTimeWidget.cpp @@ -15,7 +15,7 @@ #include "GUI/View/Tuning/JobRealTimeWidget.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Model/JobModel.h" -#include "GUI/View/Tool/mainwindow_constants.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Tuning/ParameterTuningStackPresenter.h" #include "GUI/View/Tuning/ParameterTuningWidget.h" #include <QSettings> diff --git a/GUI/View/Tuning/ParameterTuningWidget.cpp b/GUI/View/Tuning/ParameterTuningWidget.cpp index 9263d02d7a6..283360d7f1a 100644 --- a/GUI/View/Tuning/ParameterTuningWidget.cpp +++ b/GUI/View/Tuning/ParameterTuningWidget.cpp @@ -20,8 +20,8 @@ #include "GUI/Model/Model/ParameterTuningModel.h" #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/View/Info/CautionSign.h" +#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/ParEdit/ParameterTuningDelegate.h" -#include "GUI/View/Tool/mainwindow_constants.h" #include "GUI/View/Tuning/ParameterBackupWidget.h" #include "GUI/View/Tuning/SliderSettingsWidget.h" #include "GUI/View/Widget/StyledToolbar.h" -- GitLab