diff --git a/GUI/Support/Style/Style.cpp b/GUI/View/Base/Fontsize.cpp similarity index 95% rename from GUI/Support/Style/Style.cpp rename to GUI/View/Base/Fontsize.cpp index 47c965d1be6c07f4cfe1b3e6c026981468c4fdab..a712d608cee4e7a38f02f72535e6a3308e83f80c 100644 --- a/GUI/Support/Style/Style.cpp +++ b/GUI/View/Base/Fontsize.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Support/Style/Style.cpp +//! @file GUI/View/Base/Fontsize.cpp //! @brief Implements functions in namespace GUI::Style, concerned with font size. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include "Base/Util/Assert.h" #include <QApplication> diff --git a/GUI/Support/Style/Style.h b/GUI/View/Base/Fontsize.h similarity index 86% rename from GUI/Support/Style/Style.h rename to GUI/View/Base/Fontsize.h index 84a1c63481affc5c34e05cbef020ad5bd2463744..1eb42c33260232b676d465ae28e996631ad87509 100644 --- a/GUI/Support/Style/Style.h +++ b/GUI/View/Base/Fontsize.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Support/Style/Style.h +//! @file GUI/View/Base/Fontsize.h //! @brief Declares functions in namespace GUI::Style, concerned with font size. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_SUPPORT_STYLE_STYLE_H -#define BORNAGAIN_GUI_SUPPORT_STYLE_STYLE_H +#ifndef BORNAGAIN_GUI_VIEW_BASE_FONTSIZE_H +#define BORNAGAIN_GUI_VIEW_BASE_FONTSIZE_H #include <QDialog> #include <QFont> @@ -40,4 +40,4 @@ int fontSizeSmaller(); } // namespace GUI::Style -#endif // BORNAGAIN_GUI_SUPPORT_STYLE_STYLE_H +#endif // BORNAGAIN_GUI_VIEW_BASE_FONTSIZE_H diff --git a/GUI/View/FitControl/FitEditor.cpp b/GUI/View/FitControl/FitEditor.cpp index 00bb268c197fca593b2ec6feb55062ce28d10fe3..ace0bf634e0767facc18eb93bff5af417b093803 100644 --- a/GUI/View/FitControl/FitEditor.cpp +++ b/GUI/View/FitControl/FitEditor.cpp @@ -19,7 +19,7 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Tune/FitSuiteItem.h" #include "GUI/Support/Data/JobStatus.h" -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Base/mainwindow_constants.h" #include "GUI/View/Info/CautionSign.h" #include <QHBoxLayout> diff --git a/GUI/View/Info/OverlayLabelWidget.cpp b/GUI/View/Info/OverlayLabelWidget.cpp index 94157a8c5dcdb852b7a830488c46eaff5d54f89a..5322e12b05dff1ac160057a71c27f00bc68bde0b 100644 --- a/GUI/View/Info/OverlayLabelWidget.cpp +++ b/GUI/View/Info/OverlayLabelWidget.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/Info/OverlayLabelWidget.h" -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include <QPainter> OverlayLabelWidget::OverlayLabelWidget(QWidget* parent) diff --git a/GUI/View/Loader/PythonScriptWidget.cpp b/GUI/View/Loader/PythonScriptWidget.cpp index 69d3a94b885ac2b1fd6f8e7f9333bf803f328d72..8994956f3a80758f04ddf41b1966b2babf868390 100644 --- a/GUI/View/Loader/PythonScriptWidget.cpp +++ b/GUI/View/Loader/PythonScriptWidget.cpp @@ -14,8 +14,8 @@ #include "GUI/View/Loader/PythonScriptWidget.h" #include "GUI/Model/ToCore/SimulationToCore.h" -#include "GUI/Support/Style/Style.h" #include "GUI/View/Base/AppConfig.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Info/CautionSign.h" #include "GUI/View/Info/PythonSyntaxHighlighter.h" #include "GUI/View/Widget/StyledToolbar.h" diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp index e62dfaf82c26385e5f58d7360e3d4737b610e22d..6067762a63de755e18cb76d78de8bf52e9a9a454 100644 --- a/GUI/View/Main/AboutDialog.cpp +++ b/GUI/View/Main/AboutDialog.cpp @@ -13,9 +13,9 @@ // ************************************************************************************************ #include "GUI/View/Main/AboutDialog.h" -#include "GUI/Support/Style/Style.h" #include "GUI/Support/Util/Path.h" #include "GUI/View/Base/CustomEventFilters.h" +#include "GUI/View/Base/Fontsize.h" #include <QDate> #include <QLabel> #include <QPushButton> diff --git a/GUI/View/Material/MaterialEditorDialog.cpp b/GUI/View/Material/MaterialEditorDialog.cpp index 621a26f5bb896dec9169014d215bde52d2beda37..71b19c98ae5e87e65d962fc726c465b6bd7b6c8d 100644 --- a/GUI/View/Material/MaterialEditorDialog.cpp +++ b/GUI/View/Material/MaterialEditorDialog.cpp @@ -17,7 +17,7 @@ #include "GUI/Model/Material/MaterialsSet.h" #include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/SampleItem.h" -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Material/MaterialsQModel.h" #include "GUI/View/Numeric/DoubleSpinBox.h" #include "GUI/View/Setup/FrameActions.h" diff --git a/GUI/View/Plotter/ColorMap.cpp b/GUI/View/Plotter/ColorMap.cpp index 3214d7b899a40b0694f9454f534309435f1badd0..d2924cf93e2c7b4cd1b55188ee63ebeef31e1ab7 100644 --- a/GUI/View/Plotter/ColorMap.cpp +++ b/GUI/View/Plotter/ColorMap.cpp @@ -20,8 +20,8 @@ #include "GUI/Model/Axis/BasicAxisItem.h" #include "GUI/Model/Data/Data2DItem.h" #include "GUI/Model/Project/ProjectDocument.h" -#include "GUI/Support/Style/Style.h" #include "GUI/View/Base/AppConfig.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Plotter/RangeUtil.h" #include <qcustomplot.h> diff --git a/GUI/View/Plotter/HistogramPlot.cpp b/GUI/View/Plotter/HistogramPlot.cpp index 84f4a197c5dd652f023be6eca063d2722c17ff0a..0e4329f0078de643506d0641c2fe69ec5c0f8b51 100644 --- a/GUI/View/Plotter/HistogramPlot.cpp +++ b/GUI/View/Plotter/HistogramPlot.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/Plotter/HistogramPlot.h" -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include <qcustomplot.h> HistogramPlot::HistogramPlot(QWidget* parent) diff --git a/GUI/View/Plotter/PlotStatusLabel.cpp b/GUI/View/Plotter/PlotStatusLabel.cpp index b587215e9e0cf0f54a690846d84ba9d8c767ce12..25e4453ce0171e641ef46eb4db132ccb70184b51 100644 --- a/GUI/View/Plotter/PlotStatusLabel.cpp +++ b/GUI/View/Plotter/PlotStatusLabel.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/Plotter/PlotStatusLabel.h" -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Plotter/ScientificPlot.h" #include <QColor> #include <QFont> diff --git a/GUI/View/Plotter/ProjectionsPlot.cpp b/GUI/View/Plotter/ProjectionsPlot.cpp index 1579b67e6538edf7fe8c3d8e4eb40fe35297b062..3a7c8d906c0622551e4beadf45b7ad14bed00386 100644 --- a/GUI/View/Plotter/ProjectionsPlot.cpp +++ b/GUI/View/Plotter/ProjectionsPlot.cpp @@ -20,7 +20,7 @@ #include "GUI/Model/Axis/BasicAxisItem.h" #include "GUI/Model/Data/Data2DItem.h" #include "GUI/Model/Mask/MasksSet.h" // projections -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Plotter/RangeUtil.h" #include <qcustomplot.h> #include <utility> diff --git a/GUI/View/Plotter/SpecularPlot.cpp b/GUI/View/Plotter/SpecularPlot.cpp index 10e89adb7eb6e986866fb461613e6ce288a53173..5a9349824d6f2b6a1954d6be9f7db3fcd8d84059 100644 --- a/GUI/View/Plotter/SpecularPlot.cpp +++ b/GUI/View/Plotter/SpecularPlot.cpp @@ -21,7 +21,7 @@ #include "GUI/Model/Axis/BasicAxisItem.h" #include "GUI/Model/Data/Data1DItem.h" #include "GUI/Model/Project/ProjectDocument.h" -#include "GUI/Support/Style/Style.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Plotter/RangeUtil.h" namespace { diff --git a/GUI/View/Sample/ScriptPanel.cpp b/GUI/View/Sample/ScriptPanel.cpp index 62488da2523f9a6187f43c07cd4b8e92c9c29b2e..f8920a272da07d6ab79f23ec280eef48cd393cfa 100644 --- a/GUI/View/Sample/ScriptPanel.cpp +++ b/GUI/View/Sample/ScriptPanel.cpp @@ -15,8 +15,8 @@ #include "GUI/View/Sample/ScriptPanel.h" #include "GUI/Model/Sample/SampleItem.h" #include "GUI/Model/ToCore/SampleToCore.h" -#include "GUI/Support/Style/Style.h" #include "GUI/Support/Thread/UpdateTimer.h" +#include "GUI/View/Base/Fontsize.h" #include "GUI/View/Info/CautionSign.h" #include "GUI/View/Info/PythonSyntaxHighlighter.h" #include "Sample/Multilayer/MultiLayer.h"