From d7542ad2811219ab1b5775be5a2f1b8a3b59e64d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 9 Feb 2022 14:13:14 +0100
Subject: [PATCH] rename ToolBar -> Toolbar, except in Qt API
---
...mComboToolBar.cpp => ItemComboToolbar.cpp} | 26 +++++------
...{ItemComboToolBar.h => ItemComboToolbar.h} | 12 ++---
GUI/View/Common/ItemComboWidget.cpp | 28 +++++------
GUI/View/Common/ItemComboWidget.h | 6 +--
.../{StyledToolBar.cpp => StyledToolbar.cpp} | 16 +++----
.../{StyledToolBar.h => StyledToolbar.h} | 10 ++--
GUI/View/Fit/ParameterTuningWidget.cpp | 10 ++--
GUI/View/Import/RealDataMaskWidget.cpp | 2 +-
GUI/View/Import/RealDataSelectorWidget.cpp | 2 +-
GUI/View/Import/SpecularDataImportWidget.cpp | 4 +-
GUI/View/Import/SpecularDataImportWidget.ui | 6 +--
GUI/View/Instrument/InstrumentView.cpp | 4 +-
GUI/View/Job/JobListView.cpp | 16 +++----
GUI/View/Mask/MaskEditor.cpp | 28 +++++------
GUI/View/Mask/MaskEditor.h | 6 +--
GUI/View/Mask/MaskEditorActions.cpp | 2 +-
GUI/View/Mask/MaskEditorActions.h | 2 +-
...ditorToolBar.cpp => MaskEditorToolbar.cpp} | 46 +++++++++----------
...askEditorToolBar.h => MaskEditorToolbar.h} | 8 ++--
.../IntensityDataProjectionsWidget.cpp | 2 +-
GUI/View/Projection/ProjectionsEditor.cpp | 30 ++++++------
GUI/View/Projection/ProjectionsEditor.h | 6 +--
.../Projection/ProjectionsEditorActions.cpp | 2 +-
.../Projection/ProjectionsEditorActions.h | 2 +-
...ionsToolBar.cpp => ProjectionsToolbar.cpp} | 30 ++++++------
...jectionsToolBar.h => ProjectionsToolbar.h} | 8 ++--
.../LayerOrientedSampleEditor.cpp | 4 +-
GUI/View/SampleDesigner/RealSpacePanel.cpp | 4 +-
GUI/View/SampleDesigner/SampleView.cpp | 4 +-
GUI/View/Script/PythonScriptWidget.cpp | 10 ++--
GUI/View/Toplevel/SessionModelView.cpp | 8 ++--
GUI/ba3d/view/canvas.h | 2 +-
32 files changed, 173 insertions(+), 173 deletions(-)
rename GUI/View/Common/{ItemComboToolBar.cpp => ItemComboToolbar.cpp} (78%)
rename GUI/View/Common/{ItemComboToolBar.h => ItemComboToolbar.h} (82%)
rename GUI/View/Common/{StyledToolBar.cpp => StyledToolbar.cpp} (77%)
rename GUI/View/Common/{StyledToolBar.h => StyledToolbar.h} (78%)
rename GUI/View/Mask/{MaskEditorToolBar.cpp => MaskEditorToolbar.cpp} (86%)
rename GUI/View/Mask/{MaskEditorToolBar.h => MaskEditorToolbar.h} (89%)
rename GUI/View/Projection/{ProjectionsToolBar.cpp => ProjectionsToolbar.cpp} (86%)
rename GUI/View/Projection/{ProjectionsToolBar.h => ProjectionsToolbar.h} (88%)
diff --git a/GUI/View/Common/ItemComboToolBar.cpp b/GUI/View/Common/ItemComboToolbar.cpp
similarity index 78%
rename from GUI/View/Common/ItemComboToolBar.cpp
rename to GUI/View/Common/ItemComboToolbar.cpp
index faed0c1cdf1..432703a6ec9 100644
--- a/GUI/View/Common/ItemComboToolBar.cpp
+++ b/GUI/View/Common/ItemComboToolbar.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Common/ItemComboToolBar.cpp
-//! @brief Implements class ItemComboToolBar
+//! @file GUI/View/Common/ItemComboToolbar.cpp
+//! @brief Implements class ItemComboToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "GUI/View/Common/ItemComboToolBar.h"
+#include "GUI/View/Common/ItemComboToolbar.h"
#include "Base/Util/Assert.h"
#include <QAction>
#include <QComboBox>
#include <QStandardItemModel>
-ItemComboToolBar::ItemComboToolBar(QWidget* parent)
- : StyledToolBar(parent)
+ItemComboToolbar::ItemComboToolbar(QWidget* parent)
+ : StyledToolbar(parent)
, m_comboBox(new QComboBox)
, m_comboBoxAction(nullptr)
{
@@ -32,14 +32,14 @@ ItemComboToolBar::ItemComboToolBar(QWidget* parent)
setComboConnected(true);
}
-void ItemComboToolBar::setPresentation(const QString& name)
+void ItemComboToolbar::setPresentation(const QString& name)
{
setComboConnected(false);
m_comboBox->setCurrentText(name);
setComboConnected(true);
}
-void ItemComboToolBar::setPresentationList(const QStringList& presentationList,
+void ItemComboToolbar::setPresentationList(const QStringList& presentationList,
const QStringList& activeList)
{
QString previous = currentPresentation();
@@ -56,14 +56,14 @@ void ItemComboToolBar::setPresentationList(const QStringList& presentationList,
setComboConnected(true);
}
-QString ItemComboToolBar::currentPresentation() const
+QString ItemComboToolbar::currentPresentation() const
{
return m_comboBox->currentText();
}
//! Sets external actions to tool bar (previous actions will be removed).
-void ItemComboToolBar::setActionList(const QList<QAction*>& actionList)
+void ItemComboToolbar::setActionList(const QList<QAction*>& actionList)
{
for (auto* action : actions())
removeAction(action);
@@ -76,22 +76,22 @@ void ItemComboToolBar::setActionList(const QList<QAction*>& actionList)
addAction(m_comboBoxAction);
}
-void ItemComboToolBar::setComboConnected(bool value)
+void ItemComboToolbar::setComboConnected(bool value)
{
if (value)
connect(m_comboBox,
static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
- this, &ItemComboToolBar::comboChanged, Qt::UniqueConnection);
+ this, &ItemComboToolbar::comboChanged, Qt::UniqueConnection);
else
disconnect(
m_comboBox,
static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this,
- &ItemComboToolBar::comboChanged);
+ &ItemComboToolbar::comboChanged);
}
//! All items in QComboBox which are not in given list, will be disabled (gray and unselectable).
-void ItemComboToolBar::makeItemsEnabled(const QStringList& activePresentations)
+void ItemComboToolbar::makeItemsEnabled(const QStringList& activePresentations)
{
const auto* model = dynamic_cast<const QStandardItemModel*>(m_comboBox->model());
ASSERT(model);
diff --git a/GUI/View/Common/ItemComboToolBar.h b/GUI/View/Common/ItemComboToolbar.h
similarity index 82%
rename from GUI/View/Common/ItemComboToolBar.h
rename to GUI/View/Common/ItemComboToolbar.h
index c7b38227a72..96687089cac 100644
--- a/GUI/View/Common/ItemComboToolBar.h
+++ b/GUI/View/Common/ItemComboToolbar.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Common/ItemComboToolBar.h
-//! @brief Defines class ItemComboToolBar
+//! @file GUI/View/Common/ItemComboToolbar.h
+//! @brief Defines class ItemComboToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -15,21 +15,21 @@
#ifndef BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOTOOLBAR_H
#define BORNAGAIN_GUI_VIEW_COMMON_ITEMCOMBOTOOLBAR_H
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include <QList>
class QAction;
class QComboBox;
-//! The ItemComboToolBar class is a styled toolbar on top of ItemComboWidget. Contains
+//! The ItemComboToolbar class is a styled toolbar on top of ItemComboWidget. Contains
//! ComboBox to switch ItemComboWidget, and dynamic list of actions, which are updated
//! according to current state of ItemComboWidget.
-class ItemComboToolBar : public StyledToolBar {
+class ItemComboToolbar : public StyledToolbar {
Q_OBJECT
public:
- explicit ItemComboToolBar(QWidget* parent = nullptr);
+ explicit ItemComboToolbar(QWidget* parent = nullptr);
void setPresentation(const QString& name);
diff --git a/GUI/View/Common/ItemComboWidget.cpp b/GUI/View/Common/ItemComboWidget.cpp
index 01543337d17..042e9d3d7ff 100644
--- a/GUI/View/Common/ItemComboWidget.cpp
+++ b/GUI/View/Common/ItemComboWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Common/ItemComboWidget.h"
#include "Base/Util/Assert.h"
-#include "GUI/View/Common/ItemComboToolBar.h"
+#include "GUI/View/Common/ItemComboToolbar.h"
#include <QComboBox>
#include <QEvent>
#include <QStackedWidget>
@@ -22,7 +22,7 @@
ItemComboWidget::ItemComboWidget(QWidget* parent)
: SessionItemWidget(parent)
- , m_toolBar(new ItemComboToolBar)
+ , m_toolbar(new ItemComboToolbar)
, m_stackedWidget(new QStackedWidget)
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -34,13 +34,13 @@ ItemComboWidget::ItemComboWidget(QWidget* parent)
layout->setMargin(0);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
- layout->addWidget(m_toolBar);
+ layout->addWidget(m_toolbar);
layout->addWidget(m_stackedWidget);
setLayout(layout);
- connect(m_toolBar, &ItemComboToolBar::comboChanged, this, &ItemComboWidget::onComboChanged);
+ connect(m_toolbar, &ItemComboToolbar::comboChanged, this, &ItemComboWidget::onComboChanged);
- setToolBarVisible(false);
+ setToolbarVisible(false);
}
void ItemComboWidget::registerWidget(const QString& presentationType, factory_function_t f)
@@ -54,15 +54,15 @@ void ItemComboWidget::setPresentation(const QString& presentationType)
{
if (presentationType.isEmpty()) {
m_stackedWidget->setCurrentWidget(m_blankWidget);
- setToolBarVisible(false);
+ setToolbarVisible(false);
return;
}
if (!activePresentationList(currentItem()).contains(presentationType))
return;
- setToolBarVisible(true);
- m_toolBar->setPresentation(presentationType);
+ setToolbarVisible(true);
+ m_toolbar->setPresentation(presentationType);
ASSERT(currentItem());
@@ -75,7 +75,7 @@ void ItemComboWidget::setPresentation(const QString& presentationType)
}
ASSERT(widget);
widget->setItem(currentItem());
- m_toolBar->setActionList(widget->actionList());
+ m_toolbar->setActionList(widget->actionList());
m_stackedWidget->setCurrentWidget(widget);
if (widget->isHidden())
widget->show();
@@ -83,9 +83,9 @@ void ItemComboWidget::setPresentation(const QString& presentationType)
setSizeToCurrentWidget();
}
-void ItemComboWidget::setToolBarVisible(bool value)
+void ItemComboWidget::setToolbarVisible(bool value)
{
- m_toolBar->setVisible(value);
+ m_toolbar->setVisible(value);
}
void ItemComboWidget::setItem(SessionItem* item)
@@ -93,7 +93,7 @@ void ItemComboWidget::setItem(SessionItem* item)
if (!item)
m_stackedWidget->setCurrentWidget(m_blankWidget);
SessionItemWidget::setItem(item);
- setToolBarVisible(item && !itemPresentation().isEmpty());
+ setToolbarVisible(item && !itemPresentation().isEmpty());
}
//! Returns list of active presentations for given item. Active presentation is the one
@@ -124,12 +124,12 @@ QString ItemComboWidget::itemPresentation() const
QString ItemComboWidget::selectedPresentation() const
{
- return m_toolBar->currentPresentation();
+ return m_toolbar->currentPresentation();
}
void ItemComboWidget::subscribeToItem()
{
- m_toolBar->setPresentationList(presentationList(currentItem()),
+ m_toolbar->setPresentationList(presentationList(currentItem()),
activePresentationList(currentItem()));
setPresentation(itemPresentation());
}
diff --git a/GUI/View/Common/ItemComboWidget.h b/GUI/View/Common/ItemComboWidget.h
index 8eae588e7a0..f1530bb0ae7 100644
--- a/GUI/View/Common/ItemComboWidget.h
+++ b/GUI/View/Common/ItemComboWidget.h
@@ -23,7 +23,7 @@
class SessionItem;
class SessionItemWidget;
-class ItemComboToolBar;
+class ItemComboToolbar;
class QStackedWidget;
//! The ItemComboWidget class combines stack of widgets with QComboBox controller to switch between
@@ -49,7 +49,7 @@ public:
virtual void setPresentation(const QString& presentationType);
- void setToolBarVisible(bool value);
+ void setToolbarVisible(bool value);
void setItem(SessionItem* item) override;
protected:
@@ -65,7 +65,7 @@ private slots:
private:
void setSizeToCurrentWidget();
- ItemComboToolBar* m_toolBar;
+ ItemComboToolbar* m_toolbar;
QStackedWidget* m_stackedWidget;
IFactory<QString, SessionItemWidget> m_widgetFactory;
QMap<QString, SessionItemWidget*> m_presentationTypeToWidget;
diff --git a/GUI/View/Common/StyledToolBar.cpp b/GUI/View/Common/StyledToolbar.cpp
similarity index 77%
rename from GUI/View/Common/StyledToolBar.cpp
rename to GUI/View/Common/StyledToolbar.cpp
index 14977092f01..274631ff645 100644
--- a/GUI/View/Common/StyledToolBar.cpp
+++ b/GUI/View/Common/StyledToolbar.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Common/StyledToolBar.cpp
-//! @brief Implements class StyledToolBar
+//! @file GUI/View/Common/StyledToolbar.cpp
+//! @brief Implements class StyledToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include <QLabel>
#include <QStyle>
-StyledToolBar::StyledToolBar(QWidget* parent)
+StyledToolbar::StyledToolbar(QWidget* parent)
: QToolBar(parent)
{
setMovable(false);
@@ -26,7 +26,7 @@ StyledToolBar::StyledToolBar(QWidget* parent)
setContentsMargins(0, 0, 0, 0);
}
-void StyledToolBar::addStyledSeparator()
+void StyledToolbar::addStyledSeparator()
{
addWidget(new QLabel(" "));
addSeparator();
@@ -35,21 +35,21 @@ void StyledToolBar::addStyledSeparator()
//! Width of the spacing between buttons
-void StyledToolBar::addSpacing(int width)
+void StyledToolbar::addSpacing(int width)
{
QString space;
space.fill(' ', width);
addWidget(new QLabel(space));
}
-void StyledToolBar::addStyledExpand()
+void StyledToolbar::addStyledExpand()
{
auto* empty = new QWidget();
empty->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
addWidget(empty);
}
-void StyledToolBar::contextMenuEvent(QContextMenuEvent*)
+void StyledToolbar::contextMenuEvent(QContextMenuEvent*)
{
// Context menu reimplemented to suppress the default one
}
diff --git a/GUI/View/Common/StyledToolBar.h b/GUI/View/Common/StyledToolbar.h
similarity index 78%
rename from GUI/View/Common/StyledToolBar.h
rename to GUI/View/Common/StyledToolbar.h
index 36fa7b000de..5bd5ddf972c 100644
--- a/GUI/View/Common/StyledToolBar.h
+++ b/GUI/View/Common/StyledToolbar.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Common/StyledToolBar.h
-//! @brief Defines class StyledToolBar
+//! @file GUI/View/Common/StyledToolbar.h
+//! @brief Defines class StyledToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -17,13 +17,13 @@
#include <QToolBar>
-//! The StyledToolBar class represents our standard narrow toolbar with the height 24 pixels.
+//! The StyledToolbar class represents our standard narrow toolbar with the height 24 pixels.
-class StyledToolBar : public QToolBar {
+class StyledToolbar : public QToolBar {
Q_OBJECT
public:
- explicit StyledToolBar(QWidget* parent = nullptr);
+ explicit StyledToolbar(QWidget* parent = nullptr);
void addStyledSeparator();
void addSpacing(int width = 2);
void addStyledExpand();
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index 88cf278ac78..917980a2c98 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Fit/ParameterTuningDelegate.h"
#include "GUI/View/Fit/SliderSettingsWidget.h"
#include "GUI/View/Info/CautionSign.h"
@@ -48,14 +48,14 @@ ParameterTuningWidget::ParameterTuningWidget(QWidget* parent)
connect(resetValuesAction, &QAction::triggered, this,
&ParameterTuningWidget::restoreModelsOfCurrentJobItem);
- auto* toolBar = new StyledToolBar(this);
- toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- toolBar->addAction(resetValuesAction);
+ auto* toolbar = new StyledToolbar(this);
+ toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ toolbar->addAction(resetValuesAction);
auto* mainLayout = new QVBoxLayout;
mainLayout->setMargin(0);
mainLayout->setSpacing(0);
- mainLayout->addWidget(toolBar);
+ mainLayout->addWidget(toolbar);
mainLayout->addWidget(m_sliderSettingsWidget);
mainLayout->addWidget(m_treeView);
setLayout(mainLayout);
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index 1b27541657e..a9362789170 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -42,7 +42,7 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
QList<QAction*> RealDataMaskWidget::actionList()
{
- return m_maskEditor->topToolBarActions();
+ return m_maskEditor->topToolbarActions();
}
void RealDataMaskWidget::subscribeToItem()
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 911f494bf1f..3e81b89fd03 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -21,7 +21,7 @@
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Import/ImportDataUtils.h"
#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/View/Import/RealDataTreeModel.h"
diff --git a/GUI/View/Import/SpecularDataImportWidget.cpp b/GUI/View/Import/SpecularDataImportWidget.cpp
index 6617f7dc079..c46394a9574 100644
--- a/GUI/View/Import/SpecularDataImportWidget.cpp
+++ b/GUI/View/Import/SpecularDataImportWidget.cpp
@@ -68,9 +68,9 @@ SpecularDataImportWidget::SpecularDataImportWidget(QWidget* parent)
m_ui->specularDataCanvas->enableDeprecatedOnMousePress(false); // we have an own handler
- m_ui->plotToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ m_ui->plotToolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
for (auto* action : m_ui->specularDataCanvas->actionList())
- m_ui->plotToolBar->addAction(action);
+ m_ui->plotToolbar->addAction(action);
}
void SpecularDataImportWidget::setItem(SessionItem* _realDataItem)
diff --git a/GUI/View/Import/SpecularDataImportWidget.ui b/GUI/View/Import/SpecularDataImportWidget.ui
index e437179b0b6..0082c1f39ed 100644
--- a/GUI/View/Import/SpecularDataImportWidget.ui
+++ b/GUI/View/Import/SpecularDataImportWidget.ui
@@ -278,7 +278,7 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="StyledToolBar" name="plotToolBar" native="true"/>
+ <widget class="StyledToolbar" name="plotToolbar" native="true"/>
</item>
<item>
<widget class="SpecularDataCanvas" name="specularDataCanvas" native="true"/>
@@ -298,9 +298,9 @@
<container>1</container>
</customwidget>
<customwidget>
- <class>StyledToolBar</class>
+ <class>StyledToolbar</class>
<extends>QWidget</extends>
- <header>GUI/View/Common/StyledToolBar.h</header>
+ <header>GUI/View/Common/StyledToolbar.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/GUI/View/Instrument/InstrumentView.cpp b/GUI/View/Instrument/InstrumentView.cpp
index 9338f4ebca7..b67817fca3e 100644
--- a/GUI/View/Instrument/InstrumentView.cpp
+++ b/GUI/View/Instrument/InstrumentView.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Instrument/InstrumentView.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Instrument/DepthProbeInstrumentEditor.h"
#include "GUI/View/Instrument/GISASInstrumentEditor.h"
#include "GUI/View/Instrument/InstrumentListView.h"
@@ -55,7 +55,7 @@ InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
rightVLayout->addWidget(m_scrollArea);
horizontalLayout->addLayout(rightVLayout, 1);
- auto* toolbar = new StyledToolBar(this);
+ auto* toolbar = new StyledToolbar(this);
toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
toolbar->addActions(m_instrumentListView->toolbarActions());
diff --git a/GUI/View/Job/JobListView.cpp b/GUI/View/Job/JobListView.cpp
index 8aec6f6efde..65a706613c2 100644
--- a/GUI/View/Job/JobListView.cpp
+++ b/GUI/View/Job/JobListView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Job/JobListModel.h"
#include "GUI/View/Job/JobListViewDelegate.h"
#include <QAction>
@@ -76,13 +76,13 @@ JobListView::JobListView(JobModel* jobs, QWidget* parent, Qt::WindowFlags f)
m_equalizeMenu = new QMenu("Equalize selected plots", this);
- QToolBar* toolBar = new StyledToolBar(this);
- toolBar->setMinimumSize(toolBar->minimumHeight(), toolBar->minimumHeight());
- toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- toolBar->addAction(m_runAction);
- toolBar->addAction(m_cancelAction);
- toolBar->addAction(m_removeAction);
- layout->addWidget(toolBar);
+ QToolBar* toolbar = new StyledToolbar(this);
+ toolbar->setMinimumSize(toolbar->minimumHeight(), toolbar->minimumHeight());
+ toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ toolbar->addAction(m_runAction);
+ toolbar->addAction(m_cancelAction);
+ toolbar->addAction(m_removeAction);
+ layout->addWidget(toolbar);
m_listView = new QListView(this);
m_listView->setSelectionMode(QAbstractItemView::ExtendedSelection);
diff --git a/GUI/View/Mask/MaskEditor.cpp b/GUI/View/Mask/MaskEditor.cpp
index b5abb5fd8db..142446b057f 100644
--- a/GUI/View/Mask/MaskEditor.cpp
+++ b/GUI/View/Mask/MaskEditor.cpp
@@ -18,7 +18,7 @@
#include "GUI/View/Mask/MaskEditorActions.h"
#include "GUI/View/Mask/MaskEditorCanvas.h"
#include "GUI/View/Mask/MaskEditorPropertyPanel.h"
-#include "GUI/View/Mask/MaskEditorToolBar.h"
+#include "GUI/View/Mask/MaskEditorToolbar.h"
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include <QBoxLayout>
#include <QContextMenuEvent>
@@ -27,7 +27,7 @@
MaskEditor::MaskEditor(QWidget* parent)
: QMainWindow(parent)
, m_editorActions(new MaskEditorActions(this))
- , m_toolBar(new MaskEditorToolBar(m_editorActions))
+ , m_toolbar(new MaskEditorToolbar(m_editorActions))
, m_editorPropertyPanel(new MaskEditorPropertyPanel)
, m_editorCanvas(new MaskEditorCanvas)
{
@@ -39,7 +39,7 @@ MaskEditor::MaskEditor(QWidget* parent)
splitter->addWidget(m_editorPropertyPanel);
splitter->setCollapsible(1, true);
- addToolBar(Qt::RightToolBarArea, m_toolBar);
+ addToolBar(Qt::RightToolBarArea, m_toolbar);
setCentralWidget(splitter);
@@ -84,9 +84,9 @@ void MaskEditor::contextMenuEvent(QContextMenuEvent* event)
//! Returns list of actions intended for styled toolbar (on the top).
-QList<QAction*> MaskEditor::topToolBarActions()
+QList<QAction*> MaskEditor::topToolbarActions()
{
- return m_editorActions->topToolBarActions();
+ return m_editorActions->topToolbarActions();
}
void MaskEditor::setup_connections()
@@ -103,21 +103,21 @@ void MaskEditor::setup_connections()
connect(m_editorActions, &MaskEditorActions::savePlotRequest, m_editorCanvas,
&MaskEditorCanvas::onSavePlotRequest);
- // selection/drawing activity is propagated from ToolBar to graphics scene
- connect(m_toolBar, &MaskEditorToolBar::activityModeChanged, m_editorCanvas->getScene(),
+ // selection/drawing activity is propagated from Toolbar to graphics scene
+ connect(m_toolbar, &MaskEditorToolbar::activityModeChanged, m_editorCanvas->getScene(),
&MaskGraphicsScene::onActivityModeChanged);
- // mask value is propagated from ToolBar to graphics scene
- connect(m_toolBar, &MaskEditorToolBar::maskValueChanged, m_editorCanvas->getScene(),
+ // mask value is propagated from Toolbar to graphics scene
+ connect(m_toolbar, &MaskEditorToolbar::maskValueChanged, m_editorCanvas->getScene(),
&MaskGraphicsScene::onMaskValueChanged);
- // show results request is propagated from ToolBar to Canvas
- connect(m_toolBar, &MaskEditorToolBar::presentationTypeRequest, m_editorCanvas,
+ // show results request is propagated from Toolbar to Canvas
+ connect(m_toolbar, &MaskEditorToolbar::presentationTypeRequest, m_editorCanvas,
&MaskEditorCanvas::onPresentationTypeRequest);
- // space bar push (request for zoom mode) is propagated from graphics view to ToolBar
- connect(m_editorCanvas, &MaskEditorCanvas::changeActivityRequest, m_toolBar,
- &MaskEditorToolBar::onChangeActivityRequest);
+ // space bar push (request for zoom mode) is propagated from graphics view to Toolbar
+ connect(m_editorCanvas, &MaskEditorCanvas::changeActivityRequest, m_toolbar,
+ &MaskEditorToolbar::onChangeActivityRequest);
// Delete request is propagated from canvas to actions
connect(m_editorCanvas, &MaskEditorCanvas::deleteSelectedRequest, m_editorActions,
diff --git a/GUI/View/Mask/MaskEditor.h b/GUI/View/Mask/MaskEditor.h
index 865da60c1a1..f35f08c2cf4 100644
--- a/GUI/View/Mask/MaskEditor.h
+++ b/GUI/View/Mask/MaskEditor.h
@@ -21,7 +21,7 @@
class MaskEditorPropertyPanel;
class MaskEditorActions;
-class MaskEditorToolBar;
+class MaskEditorToolbar;
class MaskEditorCanvas;
class SessionModel;
class IntensityDataItem;
@@ -45,7 +45,7 @@ public slots:
void onPropertyPanelRequest();
- QList<QAction*> topToolBarActions();
+ QList<QAction*> topToolbarActions();
protected:
void contextMenuEvent(QContextMenuEvent* event) override;
@@ -54,7 +54,7 @@ private:
void setup_connections();
MaskEditorActions* m_editorActions;
- MaskEditorToolBar* m_toolBar;
+ MaskEditorToolbar* m_toolbar;
MaskEditorPropertyPanel* m_editorPropertyPanel;
MaskEditorCanvas* m_editorCanvas;
};
diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
index 3b1efe5a221..94126d5ddd1 100644
--- a/GUI/View/Mask/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -88,7 +88,7 @@ QAction* MaskEditorActions::bringToFrontAction()
return m_bringToFrontAction;
}
-QList<QAction*> MaskEditorActions::topToolBarActions()
+QList<QAction*> MaskEditorActions::topToolbarActions()
{
return QList<QAction*>() << m_resetViewAction << m_togglePanelAction;
}
diff --git a/GUI/View/Mask/MaskEditorActions.h b/GUI/View/Mask/MaskEditorActions.h
index 3fe6a84f873..f0eb7ee3e08 100644
--- a/GUI/View/Mask/MaskEditorActions.h
+++ b/GUI/View/Mask/MaskEditorActions.h
@@ -41,7 +41,7 @@ public:
QAction* sendToBackAction();
QAction* bringToFrontAction();
- QList<QAction*> topToolBarActions();
+ QList<QAction*> topToolbarActions();
signals:
void resetViewRequest();
diff --git a/GUI/View/Mask/MaskEditorToolBar.cpp b/GUI/View/Mask/MaskEditorToolbar.cpp
similarity index 86%
rename from GUI/View/Mask/MaskEditorToolBar.cpp
rename to GUI/View/Mask/MaskEditorToolbar.cpp
index cf1d9073139..62cdd7a9539 100644
--- a/GUI/View/Mask/MaskEditorToolBar.cpp
+++ b/GUI/View/Mask/MaskEditorToolbar.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Mask/MaskEditorToolBar.cpp
-//! @brief Implements class MaskEditorToolBar
+//! @file GUI/View/Mask/MaskEditorToolbar.cpp
+//! @brief Implements class MaskEditorToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Mask/MaskEditorToolBar.h"
+#include "GUI/View/Mask/MaskEditorToolbar.h"
#include "Base/Util/Assert.h"
#include "GUI/View/Mask/MaskEditorActions.h"
#include "GUI/View/Tool/mainwindow_constants.h"
@@ -23,7 +23,7 @@
#include <QToolButton>
#include <QVariant>
-MaskEditorToolBar::MaskEditorToolBar(MaskEditorActions* editorActions, QWidget* parent)
+MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget* parent)
: QToolBar(parent)
, m_editorActions(editorActions)
, m_activityButtonGroup(new QButtonGroup(this))
@@ -40,16 +40,16 @@ MaskEditorToolBar::MaskEditorToolBar(MaskEditorActions* editorActions, QWidget*
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(m_activityButtonGroup, &QButtonGroup::idClicked, this,
- &MaskEditorToolBar::onActivityGroupChange);
+ &MaskEditorToolbar::onActivityGroupChange);
connect(m_maskValueGroup, &QButtonGroup::idClicked, this,
- &MaskEditorToolBar::onMaskValueGroupChange);
+ &MaskEditorToolbar::onMaskValueGroupChange);
#else
connect(m_activityButtonGroup,
static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this,
- &MaskEditorToolBar::onActivityGroupChange);
+ &MaskEditorToolbar::onActivityGroupChange);
connect(m_maskValueGroup,
static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this,
- &MaskEditorToolBar::onMaskValueGroupChange);
+ &MaskEditorToolbar::onMaskValueGroupChange);
#endif
m_previousActivity = currentActivity();
@@ -57,7 +57,7 @@ MaskEditorToolBar::MaskEditorToolBar(MaskEditorActions* editorActions, QWidget*
//! Handles ZOOM requests from MaskGraphicsView while user press and holds
//! space bar. As soon as space bar is released, activity is returned to previous state.
-void MaskEditorToolBar::onChangeActivityRequest(MaskEditorFlags::Activity value)
+void MaskEditorToolbar::onChangeActivityRequest(MaskEditorFlags::Activity value)
{
if (value == MaskEditorFlags::PREVIOUS_MODE)
setCurrentActivity(m_previousActivity);
@@ -68,29 +68,29 @@ void MaskEditorToolBar::onChangeActivityRequest(MaskEditorFlags::Activity value)
emit activityModeChanged(currentActivity());
}
-void MaskEditorToolBar::onActivityGroupChange(int value)
+void MaskEditorToolbar::onActivityGroupChange(int value)
{
Q_UNUSED(value);
emit activityModeChanged(currentActivity());
}
-void MaskEditorToolBar::onMaskValueGroupChange(int value)
+void MaskEditorToolbar::onMaskValueGroupChange(int value)
{
Q_UNUSED(value);
emit maskValueChanged(MaskEditorFlags::MaskValue(value));
}
-void MaskEditorToolBar::onPresentationTypePressed()
+void MaskEditorToolbar::onPresentationTypePressed()
{
emit presentationTypeRequest(MaskEditorFlags::MASK_PRESENTER);
}
-void MaskEditorToolBar::onPresentationTypeReleased()
+void MaskEditorToolbar::onPresentationTypeReleased()
{
emit presentationTypeRequest(MaskEditorFlags::MASK_EDITOR);
}
-void MaskEditorToolBar::setup_selection_group()
+void MaskEditorToolbar::setup_selection_group()
{
auto* panButton = new QToolButton(this);
panButton->setIcon(QIcon(":/images/hand-right.svg"));
@@ -118,7 +118,7 @@ void MaskEditorToolBar::setup_selection_group()
m_activityButtonGroup->addButton(selectionButton, MaskEditorFlags::SELECTION_MODE);
}
-void MaskEditorToolBar::setup_maskvalue_group()
+void MaskEditorToolbar::setup_maskvalue_group()
{
addWidget(new QLabel(" "));
@@ -141,7 +141,7 @@ void MaskEditorToolBar::setup_maskvalue_group()
m_maskValueGroup->addButton(maskFalseButton, MaskEditorFlags::MASK_OFF);
}
-void MaskEditorToolBar::setup_shapes_group()
+void MaskEditorToolbar::setup_shapes_group()
{
auto* roiButton = new QToolButton(this);
roiButton->setIcon(QIcon(":/Mask/images/maskeditor_roi.svg"));
@@ -197,7 +197,7 @@ void MaskEditorToolBar::setup_shapes_group()
add_separator();
}
-void MaskEditorToolBar::setup_maskmodify_group()
+void MaskEditorToolbar::setup_maskmodify_group()
{
ASSERT(m_editorActions);
addAction(m_editorActions->bringToFrontAction());
@@ -205,7 +205,7 @@ void MaskEditorToolBar::setup_maskmodify_group()
add_separator();
}
-void MaskEditorToolBar::setup_extratools_group()
+void MaskEditorToolbar::setup_extratools_group()
{
auto* presentationButton = new QToolButton(this);
presentationButton->setIcon(QIcon(":/Mask/images/maskeditor_lightbulb.svg"));
@@ -213,9 +213,9 @@ void MaskEditorToolBar::setup_extratools_group()
addWidget(presentationButton);
connect(presentationButton, &QToolButton::pressed, this,
- &MaskEditorToolBar::onPresentationTypePressed);
+ &MaskEditorToolbar::onPresentationTypePressed);
connect(presentationButton, &QToolButton::released, this,
- &MaskEditorToolBar::onPresentationTypeReleased);
+ &MaskEditorToolbar::onPresentationTypeReleased);
auto* propertyPanelButton = new QToolButton(this);
propertyPanelButton->setIcon(QIcon(":/Mask/images/maskeditor_toolpanel.svg"));
@@ -227,19 +227,19 @@ void MaskEditorToolBar::setup_extratools_group()
add_separator();
}
-void MaskEditorToolBar::add_separator()
+void MaskEditorToolbar::add_separator()
{
addWidget(new QLabel(" "));
addSeparator();
addWidget(new QLabel(" "));
}
-MaskEditorFlags::Activity MaskEditorToolBar::currentActivity() const
+MaskEditorFlags::Activity MaskEditorToolbar::currentActivity() const
{
return MaskEditorFlags::EActivityType(m_activityButtonGroup->checkedId());
}
-void MaskEditorToolBar::setCurrentActivity(MaskEditorFlags::Activity value)
+void MaskEditorToolbar::setCurrentActivity(MaskEditorFlags::Activity value)
{
m_activityButtonGroup->button(value)->setChecked(true);
}
diff --git a/GUI/View/Mask/MaskEditorToolBar.h b/GUI/View/Mask/MaskEditorToolbar.h
similarity index 89%
rename from GUI/View/Mask/MaskEditorToolBar.h
rename to GUI/View/Mask/MaskEditorToolbar.h
index 6d60d6662dc..14d7137f0f7 100644
--- a/GUI/View/Mask/MaskEditorToolBar.h
+++ b/GUI/View/Mask/MaskEditorToolbar.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Mask/MaskEditorToolBar.h
-//! @brief Defines class MaskEditorToolBar
+//! @file GUI/View/Mask/MaskEditorToolbar.h
+//! @brief Defines class MaskEditorToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -23,10 +23,10 @@ class QButtonGroup;
//! Main class to draw masks on top of intensity data map
-class MaskEditorToolBar : public QToolBar {
+class MaskEditorToolbar : public QToolBar {
Q_OBJECT
public:
- MaskEditorToolBar(MaskEditorActions* editorActions, QWidget* parent = nullptr);
+ MaskEditorToolbar(MaskEditorActions* editorActions, QWidget* parent = nullptr);
signals:
void activityModeChanged(MaskEditorFlags::Activity);
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
index aeb44f8083e..0870a5a163a 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
@@ -33,7 +33,7 @@ IntensityDataProjectionsWidget::IntensityDataProjectionsWidget(QWidget* parent)
QList<QAction*> IntensityDataProjectionsWidget::actionList()
{
- return m_projectionsEditor->topToolBarActions();
+ return m_projectionsEditor->topToolbarActions();
}
void IntensityDataProjectionsWidget::subscribeToItem()
diff --git a/GUI/View/Projection/ProjectionsEditor.cpp b/GUI/View/Projection/ProjectionsEditor.cpp
index 668bd933adc..2ba6dc4370f 100644
--- a/GUI/View/Projection/ProjectionsEditor.cpp
+++ b/GUI/View/Projection/ProjectionsEditor.cpp
@@ -18,7 +18,7 @@
#include "GUI/View/PlotUtil/IntensityDataPropertyWidget.h"
#include "GUI/View/Projection/ProjectionsEditorActions.h"
#include "GUI/View/Projection/ProjectionsEditorCanvas.h"
-#include "GUI/View/Projection/ProjectionsToolBar.h"
+#include "GUI/View/Projection/ProjectionsToolbar.h"
#include "GUI/View/Projection/ProjectionsWidget.h"
#include <QBoxLayout>
#include <QItemSelectionModel>
@@ -27,13 +27,13 @@
ProjectionsEditor::ProjectionsEditor(QWidget* parent)
: QMainWindow(parent)
, m_editorActions(new ProjectionsEditorActions(this))
- , m_toolBar(new ProjectionsToolBar(m_editorActions))
+ , m_toolbar(new ProjectionsToolbar(m_editorActions))
, m_projectionsCanvas(new ProjectionsEditorCanvas)
, m_projectionsWidget(new ProjectionsWidget)
, m_propertyPanel(new IntensityDataPropertyWidget)
, m_selectionModel(nullptr)
{
- addToolBar(Qt::RightToolBarArea, m_toolBar);
+ addToolBar(Qt::RightToolBarArea, m_toolbar);
auto* splitter = new QSplitter;
splitter->setOrientation(Qt::Vertical);
@@ -79,9 +79,9 @@ void ProjectionsEditor::resetContext()
m_projectionsWidget->setItem(nullptr);
}
-QList<QAction*> ProjectionsEditor::topToolBarActions()
+QList<QAction*> ProjectionsEditor::topToolbarActions()
{
- return m_editorActions->topToolBarActions();
+ return m_editorActions->topToolbarActions();
}
void ProjectionsEditor::setup_connections()
@@ -94,29 +94,29 @@ void ProjectionsEditor::setup_connections()
connect(m_editorActions, &ProjectionsEditorActions::propertyPanelRequest,
[=]() { m_propertyPanel->setHidden(!m_propertyPanel->isHidden()); });
- // selection/drawing activity is propagated from ToolBar to graphics scene
- connect(m_toolBar, &ProjectionsToolBar::activityModeChanged, m_projectionsCanvas,
+ // selection/drawing activity is propagated from Toolbar to graphics scene
+ connect(m_toolbar, &ProjectionsToolbar::activityModeChanged, m_projectionsCanvas,
&ProjectionsEditorCanvas::onActivityModeChanged);
- // selection/drawing activity is propagated from ToolBar to Projections Widget
- connect(m_toolBar, &ProjectionsToolBar::activityModeChanged, m_projectionsWidget,
+ // selection/drawing activity is propagated from Toolbar to Projections Widget
+ connect(m_toolbar, &ProjectionsToolbar::activityModeChanged, m_projectionsWidget,
&ProjectionsWidget::onActivityModeChanged);
// click on projections tab is propagated to tool bar
- connect(m_projectionsWidget, &ProjectionsWidget::changeActivityRequest, m_toolBar,
- &ProjectionsToolBar::onProjectionTabChange);
+ connect(m_projectionsWidget, &ProjectionsWidget::changeActivityRequest, m_toolbar,
+ &ProjectionsToolbar::onProjectionTabChange);
// Delete request is propagated from canvas to actions
connect(m_projectionsCanvas, &ProjectionsEditorCanvas::deleteSelectedRequest, m_editorActions,
&ProjectionsEditorActions::onDeleteAction);
- // space bar push (request for zoom mode) is propagated from graphics view to ToolBar
- connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeActivityRequest, m_toolBar,
- &ProjectionsToolBar::onChangeActivityRequest);
+ // space bar push (request for zoom mode) is propagated from graphics view to Toolbar
+ connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeActivityRequest, m_toolbar,
+ &ProjectionsToolbar::onChangeActivityRequest);
// ColorMap margins changed, canvas -> projection widget
connect(m_projectionsCanvas, &ProjectionsEditorCanvas::marginsChanged, m_projectionsWidget,
&ProjectionsWidget::onMarginsChanged);
- m_toolBar->onChangeActivityRequest(MaskEditorFlags::HORIZONTAL_LINE_MODE);
+ m_toolbar->onChangeActivityRequest(MaskEditorFlags::HORIZONTAL_LINE_MODE);
}
diff --git a/GUI/View/Projection/ProjectionsEditor.h b/GUI/View/Projection/ProjectionsEditor.h
index c1dd54eb3d8..bb4d3900f99 100644
--- a/GUI/View/Projection/ProjectionsEditor.h
+++ b/GUI/View/Projection/ProjectionsEditor.h
@@ -20,7 +20,7 @@
class SessionModel;
class QModelIndex;
class IntensityDataItem;
-class ProjectionsToolBar;
+class ProjectionsToolbar;
class ProjectionsEditorActions;
class ProjectionsActions;
class ProjectionsEditorCanvas;
@@ -41,13 +41,13 @@ public:
void resetContext();
- QList<QAction*> topToolBarActions();
+ QList<QAction*> topToolbarActions();
private:
void setup_connections();
ProjectionsEditorActions* m_editorActions;
- ProjectionsToolBar* m_toolBar; //! main tool bar with bottoms at the right
+ ProjectionsToolbar* m_toolbar; //! main tool bar with bottoms at the right
ProjectionsEditorCanvas* m_projectionsCanvas; //! canvas with color map at the top
ProjectionsWidget* m_projectionsWidget; //! bottom widget to draw projections plot
IntensityDataPropertyWidget* m_propertyPanel; //! panel at the right with properties
diff --git a/GUI/View/Projection/ProjectionsEditorActions.cpp b/GUI/View/Projection/ProjectionsEditorActions.cpp
index 5527f738c5c..2925dc65113 100644
--- a/GUI/View/Projection/ProjectionsEditorActions.cpp
+++ b/GUI/View/Projection/ProjectionsEditorActions.cpp
@@ -61,7 +61,7 @@ void ProjectionsEditorActions::setSelectionModel(QItemSelectionModel* selectionM
m_selectionModel = selectionModel;
}
-QList<QAction*> ProjectionsEditorActions::topToolBarActions()
+QList<QAction*> ProjectionsEditorActions::topToolbarActions()
{
return QList<QAction*>() << m_resetViewAction << m_togglePanelAction;
}
diff --git a/GUI/View/Projection/ProjectionsEditorActions.h b/GUI/View/Projection/ProjectionsEditorActions.h
index c54b65cc91c..92b9b322593 100644
--- a/GUI/View/Projection/ProjectionsEditorActions.h
+++ b/GUI/View/Projection/ProjectionsEditorActions.h
@@ -37,7 +37,7 @@ public:
void setSelectionModel(QItemSelectionModel* selectionModel);
- QList<QAction*> topToolBarActions();
+ QList<QAction*> topToolbarActions();
public slots:
void onDeleteAction();
diff --git a/GUI/View/Projection/ProjectionsToolBar.cpp b/GUI/View/Projection/ProjectionsToolbar.cpp
similarity index 86%
rename from GUI/View/Projection/ProjectionsToolBar.cpp
rename to GUI/View/Projection/ProjectionsToolbar.cpp
index e90a9bdad5a..cb5d2ecee7b 100644
--- a/GUI/View/Projection/ProjectionsToolBar.cpp
+++ b/GUI/View/Projection/ProjectionsToolbar.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Projection/ProjectionsToolBar.cpp
-//! @brief Implements class ProjectionsToolBar
+//! @file GUI/View/Projection/ProjectionsToolbar.cpp
+//! @brief Implements class ProjectionsToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Projection/ProjectionsToolBar.h"
+#include "GUI/View/Projection/ProjectionsToolbar.h"
#include "GUI/View/Projection/ProjectionsEditorActions.h"
#include "GUI/View/Tool/mainwindow_constants.h"
#include <QButtonGroup>
@@ -37,7 +37,7 @@ const QString vertical_mode_tooltip =
} // namespace
-ProjectionsToolBar::ProjectionsToolBar(ProjectionsEditorActions* editorActions, QWidget* parent)
+ProjectionsToolbar::ProjectionsToolbar(ProjectionsEditorActions* editorActions, QWidget* parent)
: QToolBar(parent)
, m_editorActions(editorActions)
, m_activityButtonGroup(new QButtonGroup(this))
@@ -51,17 +51,17 @@ ProjectionsToolBar::ProjectionsToolBar(ProjectionsEditorActions* editorActions,
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(m_activityButtonGroup, &QButtonGroup::idClicked, this,
- &ProjectionsToolBar::onActivityGroupChange);
+ &ProjectionsToolbar::onActivityGroupChange);
#else
connect(m_activityButtonGroup,
static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this,
- &ProjectionsToolBar::onActivityGroupChange);
+ &ProjectionsToolbar::onActivityGroupChange);
#endif
m_previousActivity = currentActivity();
}
-void ProjectionsToolBar::onChangeActivityRequest(MaskEditorFlags::Activity value)
+void ProjectionsToolbar::onChangeActivityRequest(MaskEditorFlags::Activity value)
{
if (value == MaskEditorFlags::PREVIOUS_MODE)
setCurrentActivity(m_previousActivity);
@@ -74,19 +74,19 @@ void ProjectionsToolBar::onChangeActivityRequest(MaskEditorFlags::Activity value
//! Change activity only if current activity is one of drawing mode (horizontal, vertical
//! projections drawing).
-void ProjectionsToolBar::onProjectionTabChange(MaskEditorFlags::Activity value)
+void ProjectionsToolbar::onProjectionTabChange(MaskEditorFlags::Activity value)
{
if (currentActivity() == MaskEditorFlags::HORIZONTAL_LINE_MODE
|| currentActivity() == MaskEditorFlags::VERTICAL_LINE_MODE)
onChangeActivityRequest(value);
}
-void ProjectionsToolBar::onActivityGroupChange(int)
+void ProjectionsToolbar::onActivityGroupChange(int)
{
emit activityModeChanged(currentActivity());
}
-void ProjectionsToolBar::setup_selection_group()
+void ProjectionsToolbar::setup_selection_group()
{
auto* panButton = new QToolButton(this);
panButton->setIcon(QIcon(":/images/hand-right.svg"));
@@ -114,7 +114,7 @@ void ProjectionsToolBar::setup_selection_group()
m_activityButtonGroup->addButton(selectionButton, MaskEditorFlags::SELECTION_MODE);
}
-void ProjectionsToolBar::setup_shapes_group()
+void ProjectionsToolbar::setup_shapes_group()
{
auto* horizontalLineButton = new QToolButton(this);
horizontalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_horizontalline.svg"));
@@ -134,7 +134,7 @@ void ProjectionsToolBar::setup_shapes_group()
add_separator();
}
-void ProjectionsToolBar::setup_extratools_group()
+void ProjectionsToolbar::setup_extratools_group()
{
auto* saveButton = new QToolButton(this);
saveButton->setIcon(QIcon(":/Mask/images/maskeditor_save.svg"));
@@ -144,19 +144,19 @@ void ProjectionsToolBar::setup_extratools_group()
&ProjectionsEditorActions::onSaveAction);
}
-void ProjectionsToolBar::add_separator()
+void ProjectionsToolbar::add_separator()
{
addWidget(new QLabel(" "));
addSeparator();
addWidget(new QLabel(" "));
}
-MaskEditorFlags::Activity ProjectionsToolBar::currentActivity() const
+MaskEditorFlags::Activity ProjectionsToolbar::currentActivity() const
{
return MaskEditorFlags::EActivityType(m_activityButtonGroup->checkedId());
}
-void ProjectionsToolBar::setCurrentActivity(MaskEditorFlags::Activity value)
+void ProjectionsToolbar::setCurrentActivity(MaskEditorFlags::Activity value)
{
int button_index = static_cast<int>(value);
m_activityButtonGroup->button(button_index)->setChecked(true);
diff --git a/GUI/View/Projection/ProjectionsToolBar.h b/GUI/View/Projection/ProjectionsToolbar.h
similarity index 88%
rename from GUI/View/Projection/ProjectionsToolBar.h
rename to GUI/View/Projection/ProjectionsToolbar.h
index fb564cb1aa7..6167765abec 100644
--- a/GUI/View/Projection/ProjectionsToolBar.h
+++ b/GUI/View/Projection/ProjectionsToolbar.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Projection/ProjectionsToolBar.h
-//! @brief Defines class ProjectionsToolBar
+//! @file GUI/View/Projection/ProjectionsToolbar.h
+//! @brief Defines class ProjectionsToolbar
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -24,11 +24,11 @@ class QButtonGroup;
//! Toolbar with projections buttons (horizontal projections, vertical projections, select, zoom)
//! located at the right-hand side of ProjectionsEditor (part of JobProjectionsWidget).
-class ProjectionsToolBar : public QToolBar {
+class ProjectionsToolbar : public QToolBar {
Q_OBJECT
public:
- ProjectionsToolBar(ProjectionsEditorActions* editorActions, QWidget* parent = nullptr);
+ ProjectionsToolbar(ProjectionsEditorActions* editorActions, QWidget* parent = nullptr);
public slots:
void onChangeActivityRequest(MaskEditorFlags::Activity value);
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index b01290d4929..f0ff3815bad 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
@@ -42,7 +42,7 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent, ProjectDoc
m_scrollArea->setWidgetResizable(true);
m_scrollArea->setWidget(createEmptyWidget());
- m_toolbar = new StyledToolBar(this);
+ m_toolbar = new StyledToolbar(this);
m_toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
auto* mainLayout = new QVBoxLayout(this);
diff --git a/GUI/View/SampleDesigner/RealSpacePanel.cpp b/GUI/View/SampleDesigner/RealSpacePanel.cpp
index e8f9d0b23b6..559cc99846e 100644
--- a/GUI/View/SampleDesigner/RealSpacePanel.cpp
+++ b/GUI/View/SampleDesigner/RealSpacePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/RealSpacePanel.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Realspace/RealSpaceCanvas.h"
#include <QVBoxLayout>
@@ -23,7 +23,7 @@ RealSpacePanel::RealSpacePanel(QWidget* parent)
{
setWindowTitle("Real Space");
- auto* toolbar = new StyledToolBar(this);
+ auto* toolbar = new StyledToolbar(this);
const auto createAction = [&](const QString& text, const QString& tooltip) -> QAction* {
auto* action = new QAction(text, this);
diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp
index 06a8e84923f..852426ac3fc 100644
--- a/GUI/View/SampleDesigner/SampleView.cpp
+++ b/GUI/View/SampleDesigner/SampleView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/View/Common/DocksController.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Realspace/RealSpaceCanvas.h"
#include "GUI/View/SampleDesigner/LayerOrientedSampleEditor.h"
#include "GUI/View/SampleDesigner/RealSpacePanel.h"
@@ -49,7 +49,7 @@ SampleView::SampleView(QWidget* parent, ProjectDocument* document)
sampleSelectionLayout->setContentsMargins(0, 0, 0, 0);
sampleSelectionLayout->setSpacing(0);
- auto* sampleSelectionToolbar = new StyledToolBar(sampleSelectionPane);
+ auto* sampleSelectionToolbar = new StyledToolbar(sampleSelectionPane);
m_sampleSelectionView = new SampleListView(this, m_document);
sampleSelectionToolbar->addAction(m_sampleSelectionView->newSampleAction());
#ifdef BORNAGAIN_PYTHON
diff --git a/GUI/View/Script/PythonScriptWidget.cpp b/GUI/View/Script/PythonScriptWidget.cpp
index 5e0626d1360..caca09c75a1 100644
--- a/GUI/View/Script/PythonScriptWidget.cpp
+++ b/GUI/View/Script/PythonScriptWidget.cpp
@@ -17,7 +17,7 @@
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
-#include "GUI/View/Common/StyledToolBar.h"
+#include "GUI/View/Common/StyledToolbar.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Info/PythonSyntaxHighlighter.h"
#include "GUI/View/Tool/DesignerHelper.h"
@@ -44,8 +44,8 @@ PythonScriptWidget::PythonScriptWidget(QWidget* parent)
resize(512, 400);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- auto* toolBar = new StyledToolBar;
- toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ auto* toolbar = new StyledToolbar;
+ toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
auto* exportAction = new QAction(this);
exportAction->setIcon(QIcon(":/images/content-save-outline.svg"));
@@ -53,7 +53,7 @@ PythonScriptWidget::PythonScriptWidget(QWidget* parent)
exportAction->setToolTip("Opens dialog to save given script into the file");
connect(exportAction, &QAction::triggered, this, &PythonScriptWidget::onExportToFileButton);
- toolBar->addAction(exportAction);
+ toolbar->addAction(exportAction);
m_textEdit->setReadOnly(true);
QFont textFont("Monospace");
@@ -67,7 +67,7 @@ PythonScriptWidget::PythonScriptWidget(QWidget* parent)
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setMargin(0);
mainLayout->setSpacing(0);
- mainLayout->addWidget(toolBar);
+ mainLayout->addWidget(toolbar);
mainLayout->addWidget(m_textEdit);
setLayout(mainLayout);
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index e7a277496c0..6f4e2bcf7e7 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -92,10 +92,10 @@ SessionModelView::SessionModelView(QWidget* parent, ProjectDocument* document)
tree->collapseAll();
});
- auto* toolBar = new QToolBar;
- toolBar->addWidget(m_expandButton);
- toolBar->addWidget(m_collapseButton);
- layout->addWidget(toolBar);
+ auto* toolbar = new QToolBar;
+ toolbar->addWidget(m_expandButton);
+ toolbar->addWidget(m_collapseButton);
+ layout->addWidget(toolbar);
layout->addWidget(tabs);
QList<SessionModel*> models{document->realDataModel(), document->jobModel()};
diff --git a/GUI/ba3d/view/canvas.h b/GUI/ba3d/view/canvas.h
index 3c36a3445fa..35303fc439d 100644
--- a/GUI/ba3d/view/canvas.h
+++ b/GUI/ba3d/view/canvas.h
@@ -47,7 +47,7 @@ public:
void setModel(Model*);
Model* getModel();
- // ToolBar Actions
+ // Toolbar Actions
void defaultView();
void sideView();
void topView();
--
GitLab