diff --git a/GUI/Support/Tool/mainwindow_constants.h b/GUI/Support/Tool/mainwindow_constants.h
index a44d2c8eb6ff10188fe8f311181d5891f3751fd0..1867974d849580b1836078b061ef4ffc76bac01e 100644
--- a/GUI/Support/Tool/mainwindow_constants.h
+++ b/GUI/Support/Tool/mainwindow_constants.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/Support/Tool/mainwindow_constants.h
-//! @brief Defines namespace GUI::Constants
+//! @brief Defines namespace GUI::Style
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -17,7 +17,7 @@
#include <QString>
-namespace GUI::Constants {
+namespace GUI::Style {
// Settings groups
const char S_MAIN_WINDOW[] = "MainWindow";
@@ -66,6 +66,6 @@ const QString JobFittingActivityName = "Fitting Activity";
const int toolbar_icon_size = 32;
-} // namespace GUI::Constants
+} // namespace GUI::Style
#endif // BORNAGAIN_GUI_SUPPORT_TOOL_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/Support/Util/Style.cpp b/GUI/Support/Util/Style.cpp
index d5aef1bf20ad153a87486f9eba9da9665a79e5de..ca565a7fdcacaeb9f15aab198c8f4543d5b0c738 100644
--- a/GUI/Support/Util/Style.cpp
+++ b/GUI/Support/Util/Style.cpp
@@ -52,7 +52,7 @@ QFont GUI::Style::sectionFont(bool bold)
QFont GUI::Style::labelFont(bool bold)
{
QFont result;
- result.setPointSize(GUI::Style::getLabelFontSize());
+ result.setPointSize(GUI::Style::fontSizeTickLabel());
result.setBold(bold);
return result;
@@ -77,27 +77,27 @@ QSize GUI::Style::SizeOfLetterM(const QWidget* widget)
return widget ? FindSizeOfLetterM(widget) : default_size;
}
-int GUI::Style::SystemPointSize()
+int GUI::Style::fontSizeSystem()
{
return QApplication::font().pointSize();
}
int GUI::Style::getSectionFontSize()
{
- return GUI::Style::SystemPointSize() * 1.2;
+ return GUI::Style::fontSizeSystem() * 1.2;
}
-int GUI::Style::getLabelFontSize()
+int GUI::Style::fontSizeTickLabel()
{
- return GUI::Style::SystemPointSize() * 0.9;
+ return GUI::Style::fontSizeSystem() * 0.9;
}
int GUI::Style::getPortFontSize()
{
- return GUI::Style::SystemPointSize() * 0.7;
+ return GUI::Style::fontSizeSystem() * 0.7;
}
int GUI::Style::getPythonEditorFontSize()
{
- return GUI::Style::SystemPointSize();
+ return GUI::Style::fontSizeSystem();
}
diff --git a/GUI/Support/Util/Style.h b/GUI/Support/Util/Style.h
index 7c9136e6740fc8fe1f9a68513256235bff4e5761..139d764bb4e16db7384d728f6245d478c4574813 100644
--- a/GUI/Support/Util/Style.h
+++ b/GUI/Support/Util/Style.h
@@ -37,10 +37,10 @@ void setResizable(QDialog* dialog);
QSize SizeOfLetterM(const QWidget* widget = nullptr);
//! Returns size in points of default system font.
-int SystemPointSize();
+int fontSizeSystem();
int getSectionFontSize();
-int getLabelFontSize();
+int fontSizeTickLabel();
int getPortFontSize();
int getPythonEditorFontSize();
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 37eab9f507ade7f2df26d903c50f3d7a52b14816..852dff3501f34e8d8f0aa751658dd7619921cd6d 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -31,7 +31,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
, m_realTimeWidget(nullptr)
, m_fitSessionManager(new FitSessionManager(this))
{
- setWindowTitle(GUI::Constants::JobFitPanelName);
+ setWindowTitle(GUI::Style::JobFitPanelName);
setObjectName("FitActivityPanel");
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
@@ -50,8 +50,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
m_fitSessionWidget = new FitSessionWidget(m_stack);
m_stack->addWidget(m_fitSessionWidget);
- setFixedSize(GUI::Constants::FIT_ACTIVITY_PANEL_WIDTH,
- GUI::Constants::FIT_ACTIVITY_PANEL_HEIGHT);
+ setFixedSize(GUI::Style::FIT_ACTIVITY_PANEL_WIDTH, GUI::Style::FIT_ACTIVITY_PANEL_HEIGHT);
applySettings();
}
@@ -116,9 +115,9 @@ void FitActivityPanel::adjustWidthToRealTimeWidget(int w)
void FitActivityPanel::applySettings()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_FIT_ACTIVITY_PANEL)) {
- settings.beginGroup(GUI::Constants::S_FIT_ACTIVITY_PANEL);
- setFixedSize(settings.value(GUI::Constants::S_FIT_ACTIVITY_PANEL_SIZE).toSize());
+ if (settings.childGroups().contains(GUI::Style::S_FIT_ACTIVITY_PANEL)) {
+ settings.beginGroup(GUI::Style::S_FIT_ACTIVITY_PANEL);
+ setFixedSize(settings.value(GUI::Style::S_FIT_ACTIVITY_PANEL_SIZE).toSize());
settings.endGroup();
}
}
@@ -126,8 +125,8 @@ void FitActivityPanel::applySettings()
void FitActivityPanel::saveSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_FIT_ACTIVITY_PANEL);
- settings.setValue(GUI::Constants::S_FIT_ACTIVITY_PANEL_SIZE, size());
+ settings.beginGroup(GUI::Style::S_FIT_ACTIVITY_PANEL);
+ settings.setValue(GUI::Style::S_FIT_ACTIVITY_PANEL_SIZE, size());
settings.endGroup();
settings.sync();
}
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index a8131afaa331f3e1d75ab6c33d75ede566813774..1bf8b18eb2c1482649f167efe092c5ac3b57b64c 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -91,10 +91,10 @@ void FitSessionWidget::onFittingError(const QString& text)
void FitSessionWidget::applySettings()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_FIT_SESSION_WIDGET)) {
- settings.beginGroup(GUI::Constants::S_FIT_SESSION_WIDGET);
+ if (settings.childGroups().contains(GUI::Style::S_FIT_SESSION_WIDGET)) {
+ settings.beginGroup(GUI::Style::S_FIT_SESSION_WIDGET);
m_tabWidget->setCurrentIndex(
- settings.value(GUI::Constants::S_FIT_SESSION_WIDGET_CURRENT_TAB).toInt());
+ settings.value(GUI::Style::S_FIT_SESSION_WIDGET_CURRENT_TAB).toInt());
settings.endGroup();
}
}
@@ -102,9 +102,8 @@ void FitSessionWidget::applySettings()
void FitSessionWidget::saveSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_FIT_SESSION_WIDGET);
- settings.setValue(GUI::Constants::S_FIT_SESSION_WIDGET_CURRENT_TAB,
- m_tabWidget->currentIndex());
+ settings.beginGroup(GUI::Style::S_FIT_SESSION_WIDGET);
+ settings.setValue(GUI::Style::S_FIT_SESSION_WIDGET_CURRENT_TAB, m_tabWidget->currentIndex());
settings.endGroup();
settings.sync();
}
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index 0a8ca3972bbd09e44ff54bb0f288f3b65f2a1b2a..d1f9949da7e7c4072101a8f87c6bde2c76546992 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -30,7 +30,7 @@ JobRealTimeWidget::JobRealTimeWidget(JobModel* jobModel, QWidget* parent)
, m_stackedWidget(new ParameterTuningStackPresenter())
, m_jobModel(jobModel)
{
- setWindowTitle(GUI::Constants::JobRealTimeWidgetName);
+ setWindowTitle(GUI::Style::JobRealTimeWidgetName);
setObjectName("JobRealTimeWidget");
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
@@ -39,7 +39,7 @@ JobRealTimeWidget::JobRealTimeWidget(JobModel* jobModel, QWidget* parent)
mainLayout->addWidget(m_stackedWidget);
setLayout(mainLayout);
- setFixedWidth(GUI::Constants::FIT_ACTIVITY_PANEL_WIDTH);
+ setFixedWidth(GUI::Style::FIT_ACTIVITY_PANEL_WIDTH);
applySettings();
}
@@ -75,9 +75,9 @@ bool JobRealTimeWidget::isValidJobItem(JobItem* item)
void JobRealTimeWidget::applySettings()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_FIT_ACTIVITY_PANEL)) {
- settings.beginGroup(GUI::Constants::S_FIT_ACTIVITY_PANEL);
- setFixedWidth(settings.value(GUI::Constants::S_FIT_ACTIVITY_PANEL_SIZE).toSize().width());
+ if (settings.childGroups().contains(GUI::Style::S_FIT_ACTIVITY_PANEL)) {
+ settings.beginGroup(GUI::Style::S_FIT_ACTIVITY_PANEL);
+ setFixedWidth(settings.value(GUI::Style::S_FIT_ACTIVITY_PANEL_SIZE).toSize().width());
settings.endGroup();
}
}
diff --git a/GUI/View/FitControl/RunFitControlWidget.cpp b/GUI/View/FitControl/RunFitControlWidget.cpp
index 3b267e7bdfaf9224cdc16f03a67e690922fc06a1..327980cb1d6ca537f3526da95ccca6edd0bf3e75 100644
--- a/GUI/View/FitControl/RunFitControlWidget.cpp
+++ b/GUI/View/FitControl/RunFitControlWidget.cpp
@@ -43,7 +43,7 @@ RunFitControlWidget::RunFitControlWidget(QWidget* parent)
, m_cautionSign(new CautionSign(this))
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- setFixedHeight(GUI::Constants::RUN_FIT_CONTROL_WIDGET_HEIGHT);
+ setFixedHeight(GUI::Style::RUN_FIT_CONTROL_WIDGET_HEIGHT);
m_startButton->setText("Run");
m_startButton->setToolTip("Run fitting");
@@ -61,7 +61,7 @@ RunFitControlWidget::RunFitControlWidget(QWidget* parent)
m_intervalSlider->setFocusPolicy(Qt::NoFocus);
m_intervalSlider->setValue(5);
- QFont font("Monospace", GUI::Style::getLabelFontSize(), QFont::Normal);
+ QFont font("Monospace", GUI::Style::fontSizeTickLabel(), QFont::Normal);
font.setPointSize(GUI::Style::getPortFontSize());
m_updateIntervalLabel->setToolTip(slider_tooltip);
m_updateIntervalLabel->setFont(font);
diff --git a/GUI/View/FitMessage/JobMessagePanel.cpp b/GUI/View/FitMessage/JobMessagePanel.cpp
index 37168c8ef5f2d32a1920009eca315e37121c27ca..e978e8b31dec2e4b0a9c5fe771ba75e303d4e2b1 100644
--- a/GUI/View/FitMessage/JobMessagePanel.cpp
+++ b/GUI/View/FitMessage/JobMessagePanel.cpp
@@ -49,7 +49,7 @@ JobMessagePanel::JobMessagePanel(QWidget* parent)
setReadOnly(true);
setFont(QFont("Courier"));
- setFixedHeight(GUI::Constants::JOB_MESSAGE_PANEL_HEIGHT);
+ setFixedHeight(GUI::Style::JOB_MESSAGE_PANEL_HEIGHT);
applySettings();
}
@@ -95,9 +95,9 @@ void JobMessagePanel::setLog(FitLog* log)
void JobMessagePanel::applySettings()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_JOB_MESSAGE_PANEL)) {
- settings.beginGroup(GUI::Constants::S_JOB_MESSAGE_PANEL);
- setFixedHeight(settings.value(GUI::Constants::S_JOB_MESSAGE_PANEL_HEIHGT).toInt());
+ if (settings.childGroups().contains(GUI::Style::S_JOB_MESSAGE_PANEL)) {
+ settings.beginGroup(GUI::Style::S_JOB_MESSAGE_PANEL);
+ setFixedHeight(settings.value(GUI::Style::S_JOB_MESSAGE_PANEL_HEIHGT).toInt());
settings.endGroup();
}
}
@@ -105,8 +105,8 @@ void JobMessagePanel::applySettings()
void JobMessagePanel::saveSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_JOB_MESSAGE_PANEL);
- settings.setValue(GUI::Constants::S_JOB_MESSAGE_PANEL_HEIHGT, height());
+ settings.beginGroup(GUI::Style::S_JOB_MESSAGE_PANEL);
+ settings.setValue(GUI::Style::S_JOB_MESSAGE_PANEL_HEIHGT, height());
settings.endGroup();
settings.sync();
}
diff --git a/GUI/View/Import/ImportDataView.cpp b/GUI/View/Import/ImportDataView.cpp
index ca03c5686f0f57a1f09484c714ae46d11178847f..cdc3ea2549563be938c4bf40e3bd09879c481063 100644
--- a/GUI/View/Import/ImportDataView.cpp
+++ b/GUI/View/Import/ImportDataView.cpp
@@ -41,8 +41,8 @@ ImportDataView::ImportDataView(QWidget* parent, ProjectDocument* document)
splitter->setCollapsible(0, false);
splitter->setCollapsible(1, false);
- splitter->setSizes(QList<int>() << GUI::Constants::ITEM_SELECTOR_WIDGET_WIDTH
- << GUI::Constants::ITEM_SELECTOR_WIDGET_WIDTH * 7);
+ splitter->setSizes(QList<int>() << GUI::Style::ITEM_SELECTOR_WIDGET_WIDTH
+ << GUI::Style::ITEM_SELECTOR_WIDGET_WIDTH * 7);
mainLayout->addWidget(splitter);
diff --git a/GUI/View/Job/JobViewActivities.cpp b/GUI/View/Job/JobViewActivities.cpp
index 4b8145a3518873f281b46ebb5344dadb545d3f11..184425ae3242587e5cf0bd3ae578181e77447d51 100644
--- a/GUI/View/Job/JobViewActivities.cpp
+++ b/GUI/View/Job/JobViewActivities.cpp
@@ -36,9 +36,9 @@ QMap<JobViewActivity, QVector<JobViewFlags::Dock>> createActivityMap()
QMap<JobViewActivity, QVector<JobViewFlags::Dock>> activityToDocks = createActivityMap();
QMap<JobViewActivity, QString> activityNames = {
- {JobViewActivity::JobView, GUI::Constants::JobViewActivityName},
- {JobViewActivity::RealTime, GUI::Constants::JobRealTimeActivityName},
- {JobViewActivity::Fitting, GUI::Constants::JobFittingActivityName}};
+ {JobViewActivity::JobView, GUI::Style::JobViewActivityName},
+ {JobViewActivity::RealTime, GUI::Style::JobRealTimeActivityName},
+ {JobViewActivity::Fitting, GUI::Style::JobFittingActivityName}};
} // namespace
diff --git a/GUI/View/JobControl/JobPropertiesWidget.cpp b/GUI/View/JobControl/JobPropertiesWidget.cpp
index fe5d4eb2902976baed72433c6fae5aff0e609ba1..dc1dd271161cf8d66ede0a90815493e1e3874219 100644
--- a/GUI/View/JobControl/JobPropertiesWidget.cpp
+++ b/GUI/View/JobControl/JobPropertiesWidget.cpp
@@ -39,7 +39,7 @@ JobPropertiesWidget::JobPropertiesWidget(QWidget* parent, Qt::WindowFlags f)
, m_jobItem(nullptr)
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
- setWindowTitle(GUI::Constants::JobPropertiesWidgetName);
+ setWindowTitle(GUI::Style::JobPropertiesWidgetName);
auto* layout = new QVBoxLayout(this);
layout->setSpacing(0);
@@ -115,10 +115,10 @@ void JobPropertiesWidget::notifyJobPropertyChange()
void JobPropertiesWidget::applySettings()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_JOB_PROPERTIES_WIDGET)) {
- settings.beginGroup(GUI::Constants::S_JOB_PROPERTIES_WIDGET);
+ if (settings.childGroups().contains(GUI::Style::S_JOB_PROPERTIES_WIDGET)) {
+ settings.beginGroup(GUI::Style::S_JOB_PROPERTIES_WIDGET);
m_tabWidget->setCurrentIndex(
- settings.value(GUI::Constants::S_JOB_PROPERTIES_WIDGET_CURRENT_TAB).toInt());
+ settings.value(GUI::Style::S_JOB_PROPERTIES_WIDGET_CURRENT_TAB).toInt());
settings.endGroup();
}
}
@@ -126,9 +126,8 @@ void JobPropertiesWidget::applySettings()
void JobPropertiesWidget::saveSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_JOB_PROPERTIES_WIDGET);
- settings.setValue(GUI::Constants::S_JOB_PROPERTIES_WIDGET_CURRENT_TAB,
- m_tabWidget->currentIndex());
+ settings.beginGroup(GUI::Style::S_JOB_PROPERTIES_WIDGET);
+ settings.setValue(GUI::Style::S_JOB_PROPERTIES_WIDGET_CURRENT_TAB, m_tabWidget->currentIndex());
settings.endGroup();
settings.sync();
}
diff --git a/GUI/View/JobControl/JobSelectorWidget.cpp b/GUI/View/JobControl/JobSelectorWidget.cpp
index 55e4fbaa7759869fc0a5991547256804c22dbe03..169b2bde9e7c6c8105d4a36e7aa93041dcbfac04 100644
--- a/GUI/View/JobControl/JobSelectorWidget.cpp
+++ b/GUI/View/JobControl/JobSelectorWidget.cpp
@@ -44,7 +44,7 @@ JobSelectorWidget::JobSelectorWidget(JobModel* jobModel, QWidget* parent)
: QWidget(parent)
, m_jobModel(jobModel)
{
- setWindowTitle(GUI::Constants::JobSelectorWidgetName);
+ setWindowTitle(GUI::Style::JobSelectorWidgetName);
setObjectName("JobSelectorWidget");
auto* layout = new QVBoxLayout(this);
@@ -71,7 +71,7 @@ JobSelectorWidget::JobSelectorWidget(JobModel* jobModel, QWidget* parent)
onSelectedJobsChanged(selectedJobItems());
- setFixedWidth(GUI::Constants::JOB_SELECTOR_PANEL_WIDTH);
+ setFixedWidth(GUI::Style::JOB_SELECTOR_PANEL_WIDTH);
applySettings();
}
@@ -110,11 +110,11 @@ void JobSelectorWidget::onSelectedJobsChanged(const QVector<JobItem*>& jobs)
void JobSelectorWidget::applySettings()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_JOB_SELECTOR_PANEL)) {
- settings.beginGroup(GUI::Constants::S_JOB_SELECTOR_PANEL);
- setFixedWidth(settings.value(GUI::Constants::S_JOB_SELECTOR_PANEL_WIDTH).toInt());
+ if (settings.childGroups().contains(GUI::Style::S_JOB_SELECTOR_PANEL)) {
+ settings.beginGroup(GUI::Style::S_JOB_SELECTOR_PANEL);
+ setFixedWidth(settings.value(GUI::Style::S_JOB_SELECTOR_PANEL_WIDTH).toInt());
m_splitter->setSizes(
- qVariantToList(settings.value(GUI::Constants::S_JOB_SELECTOR_SPLITTER_SIZES)));
+ qVariantToList(settings.value(GUI::Style::S_JOB_SELECTOR_SPLITTER_SIZES)));
settings.endGroup();
}
}
@@ -122,9 +122,9 @@ void JobSelectorWidget::applySettings()
void JobSelectorWidget::saveSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_JOB_SELECTOR_PANEL);
- settings.setValue(GUI::Constants::S_JOB_SELECTOR_PANEL_WIDTH, width());
- settings.setValue(GUI::Constants::S_JOB_SELECTOR_SPLITTER_SIZES,
+ settings.beginGroup(GUI::Style::S_JOB_SELECTOR_PANEL);
+ settings.setValue(GUI::Style::S_JOB_SELECTOR_PANEL_WIDTH, width());
+ settings.setValue(GUI::Style::S_JOB_SELECTOR_SPLITTER_SIZES,
listToQVariant(m_splitter->sizes()));
settings.endGroup();
settings.sync();
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 5fbf659decd16d8a092ab23f1d5d9d0d08705f6c..dc4e8666fd0e6aaa7b10376841abaa0e0fca2408 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -60,11 +60,11 @@ QBoxLayout* createTextLayout()
auto* result = new QVBoxLayout;
QFont titleFont;
- titleFont.setPointSize(GUI::Style::getLabelFontSize() + 2);
+ titleFont.setPointSize(GUI::Style::fontSizeTickLabel() + 2);
titleFont.setBold(true);
QFont normalFont;
- normalFont.setPointSize(GUI::Style::getLabelFontSize() + 2);
+ normalFont.setPointSize(GUI::Style::fontSizeTickLabel() + 2);
normalFont.setBold(false);
// title
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index a893d863b02bc275e127c23209dbec533ea1c535..7f4418341a2c56ac0535b010b48cef839e0263e3 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -271,9 +271,9 @@ void MainWindow::initViews()
void MainWindow::readSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_MAIN_WINDOW);
- resize(settings.value(GUI::Constants::S_WINDOW_SIZE, QSize(1000, 600)).toSize());
- move(settings.value(GUI::Constants::S_WINDOW_POSITION, QPoint(500, 300)).toPoint());
+ settings.beginGroup(GUI::Style::S_MAIN_WINDOW);
+ resize(settings.value(GUI::Style::S_WINDOW_SIZE, QSize(1000, 600)).toSize());
+ move(settings.value(GUI::Style::S_WINDOW_POSITION, QPoint(500, 300)).toPoint());
settings.endGroup();
m_projectManager->readSettings();
@@ -282,9 +282,9 @@ void MainWindow::readSettings()
void MainWindow::writeSettings()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_MAIN_WINDOW);
- settings.setValue(GUI::Constants::S_WINDOW_SIZE, size());
- settings.setValue(GUI::Constants::S_WINDOW_POSITION, pos());
+ settings.beginGroup(GUI::Style::S_MAIN_WINDOW);
+ settings.setValue(GUI::Style::S_WINDOW_SIZE, size());
+ settings.setValue(GUI::Style::S_WINDOW_POSITION, pos());
settings.endGroup();
m_projectManager->writeSettings();
settings.sync();
diff --git a/GUI/View/Mask/MaskEditorToolbar.cpp b/GUI/View/Mask/MaskEditorToolbar.cpp
index 72018dfe42a1ab8331180b96af44a65ccefdab9d..5767330aaa4a48fc95eb620a4f4acac999dadfe4 100644
--- a/GUI/View/Mask/MaskEditorToolbar.cpp
+++ b/GUI/View/Mask/MaskEditorToolbar.cpp
@@ -28,7 +28,7 @@ MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget*
, m_editorActions(editorActions)
, m_activityButtonGroup(new QButtonGroup(this))
{
- setIconSize(QSize(GUI::Constants::toolbar_icon_size, GUI::Constants::toolbar_icon_size));
+ setIconSize(QSize(GUI::Style::toolbar_icon_size, GUI::Style::toolbar_icon_size));
setProperty("_q_custom_style_disabled", QVariant(true));
//... Zoom / selection mode
diff --git a/GUI/View/PlotComparison/HistogramPlot.cpp b/GUI/View/PlotComparison/HistogramPlot.cpp
index 6e054add0a2d9e137aa19a33aaa2b05e405640cd..b038b07835cdb5159e5fff5b2f2275915d7c9382 100644
--- a/GUI/View/PlotComparison/HistogramPlot.cpp
+++ b/GUI/View/PlotComparison/HistogramPlot.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/HistogramPlot.h"
-#include "GUI/View/PlotUtil/PlotConstants.h"
+#include "GUI/Support/Util/Style.h"
#include <qcustomplot.h>
HistogramPlot::HistogramPlot(QWidget* parent)
@@ -30,10 +30,8 @@ HistogramPlot::HistogramPlot(QWidget* parent)
initGraph();
- m_plot->xAxis->setTickLabelFont(
- QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
- m_plot->yAxis->setTickLabelFont(
- QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+ m_plot->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
+ m_plot->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
m_plot->yAxis->setScaleType(QCPAxis::stLogarithmic);
m_plot->yAxis->setNumberFormat("eb");
@@ -42,8 +40,8 @@ HistogramPlot::HistogramPlot(QWidget* parent)
m_plot->xAxis->setLabel("iteration");
m_plot->yAxis->setLabel("chi2");
- m_plot->xAxis->setLabelFont(QFont(QFont().family(), GUI::Constants::plot_axes_label_size()));
- m_plot->yAxis->setLabelFont(QFont(QFont().family(), GUI::Constants::plot_axes_label_size()));
+ m_plot->xAxis->setLabelFont(QFont(QFont().family(), GUI::Style::fontSizeSystem()));
+ m_plot->yAxis->setLabelFont(QFont(QFont().family(), GUI::Style::fontSizeSystem()));
}
void HistogramPlot::addData(double x, double y)
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index e6a571534c8ec7b79ffeab21c7ab99cd4e0e2e47..342ab9895e9da8310ec2f61cb2f5ed2d65e23b50 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -23,7 +23,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Tool/UpdateTimer.h"
#include "GUI/Support/Util/QCP_Util.h"
-#include "GUI/View/PlotUtil/PlotConstants.h"
+#include "GUI/Support/Util/Style.h"
namespace {
@@ -179,8 +179,8 @@ void SpecularPlot::initPlot()
}
}
- m_qcp->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
- m_qcp->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+ m_qcp->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
+ m_qcp->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
setPlot();
}
diff --git a/GUI/View/PlotUtil/ColorMap.cpp b/GUI/View/PlotUtil/ColorMap.cpp
index 78b4739f4f3bab479f9a3106e08934e6daa3f039..615d68ef5096e6f1947ac1f8f113f037eb308c05 100644
--- a/GUI/View/PlotUtil/ColorMap.cpp
+++ b/GUI/View/PlotUtil/ColorMap.cpp
@@ -21,7 +21,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Tool/UpdateTimer.h"
#include "GUI/Support/Util/QCP_Util.h"
-#include "GUI/View/PlotUtil/PlotConstants.h"
+#include "GUI/Support/Util/Style.h"
#include <qcustomplot.h>
namespace {
@@ -45,8 +45,8 @@ ColorMap::ColorMap(QWidget* parent)
: ScientificPlot(parent, PLOT_TYPE::Plot2D)
, m_updateTimer(new UpdateTimer(replot_update_interval, this))
{
- m_qcp->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
- m_qcp->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+ m_qcp->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
+ m_qcp->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
m_qcp->setAttribute(Qt::WA_NoMousePropagation, false);
m_qcpMap = new QCPColorMap(m_qcp->xAxis, m_qcp->yAxis);
@@ -56,7 +56,7 @@ ColorMap::ColorMap(QWidget* parent)
m_colorScale->axis()->axisRect()->setAutoMargins(QCP::msNone);
m_colorScale->setBarWidth(GUI::Style::SizeOfLetterM().width());
m_colorScale->axis()->setTickLabelFont(
- QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+ QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
m_qcpMap->setColorScale(m_colorScale);
m_colorBarLayout = new QCPLayoutGrid;
diff --git a/GUI/View/PlotUtil/PlotConstants.h b/GUI/View/PlotUtil/PlotConstants.h
deleted file mode 100644
index 59ef346102305e7982d437d4b9e15e65e4832bc3..0000000000000000000000000000000000000000
--- a/GUI/View/PlotUtil/PlotConstants.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit reflection and scattering
-//
-//! @file GUI/View/PlotUtil/PlotConstants.h
-//! @brief Defines various constants for plotting
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************************************
-
-#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_PLOTCONSTANTS_H
-#define BORNAGAIN_GUI_VIEW_PLOTUTIL_PLOTCONSTANTS_H
-
-#include "GUI/Support/Util/Style.h"
-#include <QSize>
-
-namespace GUI::Constants {
-
-inline int plot_tick_label_size()
-{
- return GUI::Style::SystemPointSize() * 0.9;
-}
-
-inline int plot_axes_label_size()
-{
- return GUI::Style::SystemPointSize();
-}
-
-} // namespace GUI::Constants
-
-#endif // BORNAGAIN_GUI_VIEW_PLOTUTIL_PLOTCONSTANTS_H
diff --git a/GUI/View/PlotUtil/StatusLabel.cpp b/GUI/View/PlotUtil/StatusLabel.cpp
index 73a54509bea4cefd6fec75008cf0f526ac1807d2..10bd7f4366fa9904127042459676d8db37b0c75e 100644
--- a/GUI/View/PlotUtil/StatusLabel.cpp
+++ b/GUI/View/PlotUtil/StatusLabel.cpp
@@ -22,7 +22,7 @@ namespace {
int default_text_size()
{
- return GUI::Style::SystemPointSize();
+ return GUI::Style::fontSizeSystem();
}
int default_label_height()
{
diff --git a/GUI/View/Project/ProjectManager.cpp b/GUI/View/Project/ProjectManager.cpp
index 608815f58299ad2c7f249b7a869295033f0b4a97..576d183d04a3ff0c3d56ec6457d329baa818fb00 100644
--- a/GUI/View/Project/ProjectManager.cpp
+++ b/GUI/View/Project/ProjectManager.cpp
@@ -411,7 +411,7 @@ void ProjectManager::addToRecentProjects()
QString fname = gProjectDocument.value()->projectFullPath();
m_recentProjects.removeAll(fname);
m_recentProjects.prepend(fname);
- while (m_recentProjects.size() > GUI::Constants::MAX_RECENT_PROJECTS)
+ while (m_recentProjects.size() > GUI::Style::MAX_RECENT_PROJECTS)
m_recentProjects.removeLast();
emit recentListModified();
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index d6e3f3703713c7853cedc14db684861b2ec4a7f3..4959fa1e242f4c55307a8acc4af8e979b6759c29 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -22,8 +22,8 @@
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Support/Util/QCP_Util.h"
+#include "GUI/Support/Util/Style.h"
#include "GUI/View/PlotScale/RangeUtil.h"
-#include "GUI/View/PlotUtil/PlotConstants.h"
#include <boost/polymorphic_cast.hpp>
#include <qcustomplot.h>
#include <utility>
@@ -41,10 +41,8 @@ ProjectionsPlot::ProjectionsPlot(GUI::ID::ProjectionType projectionType, QWidget
m_plot->setAttribute(Qt::WA_NoMousePropagation, false);
setLayout(vlayout);
- m_plot->xAxis->setTickLabelFont(
- QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
- m_plot->yAxis->setTickLabelFont(
- QFont(QFont().family(), GUI::Constants::plot_tick_label_size()));
+ m_plot->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
+ m_plot->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeTickLabel()));
GUI::QCP_Util::setDefaultMargins(m_plot);
}
diff --git a/GUI/View/Projection/ProjectionsToolbar.cpp b/GUI/View/Projection/ProjectionsToolbar.cpp
index 17e898d492cef1b2074b21c40b4b6485d08e85f1..ca0b953da2a7ef06b39cd444119619e8886cc754 100644
--- a/GUI/View/Projection/ProjectionsToolbar.cpp
+++ b/GUI/View/Projection/ProjectionsToolbar.cpp
@@ -42,7 +42,7 @@ ProjectionsToolbar::ProjectionsToolbar(ProjectionsEditorActions* editorActions,
, m_editorActions(editorActions)
, m_activityButtonGroup(new QButtonGroup(this))
{
- setIconSize(QSize(GUI::Constants::toolbar_icon_size, GUI::Constants::toolbar_icon_size));
+ setIconSize(QSize(GUI::Style::toolbar_icon_size, GUI::Style::toolbar_icon_size));
setProperty("_q_custom_style_disabled", QVariant(true));
setup_selection_group();
diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp
index c301981cd1d94eff6b0a747a63a8035a050c3bd9..dba981e322f8807747d53efb91600565078992c7 100644
--- a/GUI/View/SampleDesigner/SampleView.cpp
+++ b/GUI/View/SampleDesigner/SampleView.cpp
@@ -141,21 +141,21 @@ SampleView::~SampleView()
void SampleView::applySplitterPos()
{
QSettings settings;
- if (settings.childGroups().contains(GUI::Constants::S_SAMPLE_3DVIEW_WIDGET)) {
- settings.beginGroup(GUI::Constants::S_SAMPLE_3DVIEW_WIDGET);
+ if (settings.childGroups().contains(GUI::Style::S_SAMPLE_3DVIEW_WIDGET)) {
+ settings.beginGroup(GUI::Style::S_SAMPLE_3DVIEW_WIDGET);
m_realspacePanel->setFixedSize(
- settings.value(GUI::Constants::S_SAMPLE_3DVIEW_WIDGET_SIZE).toSize());
+ settings.value(GUI::Style::S_SAMPLE_3DVIEW_WIDGET_SIZE).toSize());
settings.endGroup();
} else
- m_realspacePanel->setFixedSize(GUI::Constants::SAMPLE_3DVIEW_WIDGET_WIDTH,
- GUI::Constants::SAMPLE_3DVIEW_WIDGET_HEIGHT);
+ m_realspacePanel->setFixedSize(GUI::Style::SAMPLE_3DVIEW_WIDGET_WIDTH,
+ GUI::Style::SAMPLE_3DVIEW_WIDGET_HEIGHT);
}
void SampleView::saveSplitterPos()
{
QSettings settings;
- settings.beginGroup(GUI::Constants::S_SAMPLE_3DVIEW_WIDGET);
- settings.setValue(GUI::Constants::S_SAMPLE_3DVIEW_WIDGET_SIZE, m_realspacePanel->size());
+ settings.beginGroup(GUI::Style::S_SAMPLE_3DVIEW_WIDGET);
+ settings.setValue(GUI::Style::S_SAMPLE_3DVIEW_WIDGET_SIZE, m_realspacePanel->size());
settings.endGroup();
settings.sync();
}