diff --git a/GUI/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
similarity index 90%
rename from GUI/Views/SampleDesigner/SampleWidgetBox.cpp
rename to GUI/Views/SampleDesigner/SampleToolBox.cpp
index 0b19acf8c1acd8058c37c02a9f7c53c8341467ce..fd8dbc1cf705db026a3ae31207bf280f87169533 100644
--- a/GUI/Views/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -2,17 +2,17 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SampleDesigner/SampleWidgetBox.cpp
-//! @brief Implements class SampleWidgetBox
+//! @file GUI/Views/SampleDesigner/SampleToolBox.cpp
+//! @brief Implements class SampleToolBox
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @copyright Forschungszentrum Jülich GmbH 2021
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
//
// ************************************************************************************************
-#include "GUI/Views/SampleDesigner/SampleWidgetBox.h"
+#include "GUI/Views/SampleDesigner/SampleToolBox.h"
#include "GUI/Views/widgetbox/DesignerMimeData.h"
#include "GUI/Views/widgetbox/widgetboxtreewidget.h"
#include <QApplication>
@@ -24,12 +24,9 @@
namespace {
-class WidgetBoxFilterLineEdit : public QLineEdit {
+class FilterEdit : public QLineEdit {
public:
- explicit WidgetBoxFilterLineEdit(QWidget* parent = 0) : QLineEdit(parent)
- {
- setFocusPolicy(Qt::NoFocus);
- }
+ explicit FilterEdit(QWidget* parent = 0) : QLineEdit(parent) { setFocusPolicy(Qt::NoFocus); }
protected:
virtual void mousePressEvent(QMouseEvent* event)
@@ -60,18 +57,18 @@ protected:
} // namespace
-SampleWidgetBox::SampleWidgetBox(QWidget* parent) : QWidget(parent), m_view(new WidgetBoxTreeWidget)
+SampleToolBox::SampleToolBox(QWidget* parent) : QWidget(parent), m_view(new WidgetBoxTreeWidget)
{
- setObjectName(QLatin1String("SampleWidgetBox"));
+ setObjectName(QLatin1String("SampleToolBox"));
setWindowTitle("Items Toolbox");
// Prevent the filter from grabbing focus since Our view has Qt::NoFocus
QToolBar* toolBar = new QToolBar(this);
- QLineEdit* filterWidget = new WidgetBoxFilterLineEdit(toolBar);
- filterWidget->setPlaceholderText("Filter");
- filterWidget->setClearButtonEnabled(true);
- connect(filterWidget, &QLineEdit::textChanged, m_view, &WidgetBoxTreeWidget::filter);
- toolBar->addWidget(filterWidget);
+ QLineEdit* filterEdit = new FilterEdit(toolBar);
+ filterEdit->setPlaceholderText("Filter");
+ filterEdit->setClearButtonEnabled(true);
+ connect(filterEdit, &QLineEdit::textChanged, m_view, &WidgetBoxTreeWidget::filter);
+ toolBar->addWidget(filterEdit);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0);
@@ -80,18 +77,18 @@ SampleWidgetBox::SampleWidgetBox(QWidget* parent) : QWidget(parent), m_view(new
layout->addWidget(m_view);
setLayout(layout);
- connect(m_view, &WidgetBoxTreeWidget::pressed, this, &SampleWidgetBox::handleMousePress);
+ connect(m_view, &WidgetBoxTreeWidget::pressed, this, &SampleToolBox::handleMousePress);
fill();
}
-QSize SampleWidgetBox::minimumSizeHint() const
+QSize SampleToolBox::minimumSizeHint() const
{
return QSize(300, 300);
}
-void SampleWidgetBox::handleMousePress(const QString& /*title*/, const QString& className,
- const QPoint&)
+void SampleToolBox::handleMousePress(const QString& /*title*/, const QString& className,
+ const QPoint&)
{
if (QApplication::mouseButtons() != Qt::LeftButton)
return;
@@ -99,7 +96,7 @@ void SampleWidgetBox::handleMousePress(const QString& /*title*/, const QString&
DesignerMimeData::execDrag(className, this);
}
-void SampleWidgetBox::fill()
+void SampleToolBox::fill()
{
const auto group = [&](const QString& title) { m_view->addGroup(title); };
const auto entry = [&](const QString& title, const QString& iconName, const QString& cls,
diff --git a/GUI/Views/SampleDesigner/SampleWidgetBox.h b/GUI/Views/SampleDesigner/SampleToolBox.h
similarity index 61%
rename from GUI/Views/SampleDesigner/SampleWidgetBox.h
rename to GUI/Views/SampleDesigner/SampleToolBox.h
index 01737495061f0f0d3d3b58f40cce988b5af3bd57..8cba4af0d181f8371895593abd7b43e1e2329ef9 100644
--- a/GUI/Views/SampleDesigner/SampleWidgetBox.h
+++ b/GUI/Views/SampleDesigner/SampleToolBox.h
@@ -2,27 +2,27 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/SampleDesigner/SampleWidgetBox.h
-//! @brief Defines class SampleWidgetBox
+//! @file GUI/Views/SampleDesigner/SampleToolBox.h
+//! @brief Defines class SampleToolBox
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @copyright Forschungszentrum Jülich GmbH 2021
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEWIDGETBOX_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEWIDGETBOX_H
+#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
+#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
#include <QWidget>
class WidgetBoxTreeWidget;
-//! widget box and tool window on the left side of SampleView
-class SampleWidgetBox : public QWidget {
+//! ToolBox on the left side of SampleView
+class SampleToolBox : public QWidget {
public:
- explicit SampleWidgetBox(QWidget* parent);
+ explicit SampleToolBox(QWidget* parent);
virtual QSize minimumSizeHint() const override;
@@ -37,4 +37,4 @@ private:
WidgetBoxTreeWidget* m_view;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEWIDGETBOX_H
+#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
diff --git a/GUI/Views/SampleView.cpp b/GUI/Views/SampleView.cpp
index fc82fe4ad6dbf99e11324b820ff25c5de92bd165..4568e409f3093ffb3123335c4d7bbe0e78a164d3 100644
--- a/GUI/Views/SampleView.cpp
+++ b/GUI/Views/SampleView.cpp
@@ -21,8 +21,8 @@
#include "GUI/Views/SampleDesigner/SampleDesigner.h"
#include "GUI/Views/SampleDesigner/SamplePropertyWidget.h"
#include "GUI/Views/SampleDesigner/SampleToolBar.h"
+#include "GUI/Views/SampleDesigner/SampleToolBox.h"
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
-#include "GUI/Views/SampleDesigner/SampleWidgetBox.h"
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "GUI/mainwindow/mainwindow.h"
#include <QDockWidget>
@@ -63,7 +63,7 @@ void SampleView::fillViewMenu(QMenu* menu)
void SampleView::createSubWindows()
{
m_sampleDesigner = new SampleDesigner(this);
- m_widgetBox = new SampleWidgetBox(this);
+ m_widgetBox = new SampleToolBox(this);
m_treeWidget = new SampleTreeWidget(this, models()->sampleModel());
m_propertyWidget = new SamplePropertyWidget(m_treeWidget->treeView()->selectionModel(), this);
m_scriptPanel = new ScriptPanel(this);
diff --git a/GUI/Views/SampleView.h b/GUI/Views/SampleView.h
index 014a01722c543845fefd6fa66647c6a277af6d8e..c21dd574ba4b6d3d819be0b9366135d9a6ef121e 100644
--- a/GUI/Views/SampleView.h
+++ b/GUI/Views/SampleView.h
@@ -23,7 +23,7 @@ class SampleDesigner;
class SampleToolBar;
class ApplicationModels;
class QItemSelectionModel;
-class SampleWidgetBox;
+class SampleToolBox;
class SampleTreeWidget;
class SamplePropertyWidget;
class ScriptPanel;
@@ -49,7 +49,7 @@ private:
SampleToolBar* m_toolBar = nullptr;
SampleDesigner* m_sampleDesigner = nullptr;
- SampleWidgetBox* m_widgetBox = nullptr;
+ SampleToolBox* m_widgetBox = nullptr;
SampleTreeWidget* m_treeWidget = nullptr;
SamplePropertyWidget* m_propertyWidget = nullptr;
ScriptPanel* m_scriptPanel = nullptr;
diff --git a/GUI/Views/widgetbox/widgetboxcategorylistview.cpp b/GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
similarity index 65%
rename from GUI/Views/widgetbox/widgetboxcategorylistview.cpp
rename to GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
index 41b30fed959d138a9f803912ee6e2d0d0a690664..97dd75613a0e6fb0011098df91603b52156cbd83 100644
--- a/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
+++ b/GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/widgetboxcategorylistview.cpp
-//! @brief Implements class WidgetBoxCategoryListView
+//! @file GUI/Views/widgetbox/SampleToolBoxGroupView.cpp
+//! @brief Implements class SampleToolBoxGroupView
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/widgetbox/widgetboxcategorylistview.h"
-#include "Base/Utils/Assert.h"
+#include "GUI/Views/widgetbox/SampleToolBoxGroupView.h"
#include <QIcon>
#include <QListView>
@@ -23,13 +22,12 @@ namespace {
enum { FILTER_ROLE = Qt::UserRole + 11 };
} // namespace
-/* WidgetBoxCategoryModel, representing a list of category entries. Uses a
- * QAbstractListModel since the behaviour depends on the view mode of the list
- * view, it does not return text in the case of IconMode. */
-
-class WidgetBoxCategoryModel : public QAbstractListModel {
+//! Represents a list of group entries. Uses a
+//! QAbstractListModel since the behaviour depends on the view mode of the list
+//! view, it does not return text in the case of IconMode.
+class SampleToolBoxGroupModel : public QAbstractListModel {
public:
- explicit WidgetBoxCategoryModel(QObject* parent = 0);
+ explicit SampleToolBoxGroupModel(QObject* parent = 0);
//! Entry of the model list
struct Entry {
@@ -42,12 +40,12 @@ public:
// QAbstractListModel
- virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
- virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+ virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+ virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+ virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
- // The model returns no text in icon mode, so, it also needs to know it
- void setViewMode(QListView::ViewMode vm);
+ // The model returns no text in icon mode, so, it also needs to know the view mode
+ void setViewMode(QListView::ViewMode viewMode);
void addEntry(const QString& title, const QIcon& icon, const QString& className,
const QString& tooltip);
@@ -60,30 +58,30 @@ private:
QListView::ViewMode m_viewMode;
};
-WidgetBoxCategoryModel::WidgetBoxCategoryModel(QObject* parent)
+SampleToolBoxGroupModel::SampleToolBoxGroupModel(QObject* parent)
: QAbstractListModel(parent), m_viewMode(QListView::ListMode)
{
}
-void WidgetBoxCategoryModel::setViewMode(QListView::ViewMode vm)
+void SampleToolBoxGroupModel::setViewMode(QListView::ViewMode viewMode)
{
- if (m_viewMode == vm)
+ if (m_viewMode == viewMode)
return;
const bool empty = m_items.isEmpty();
if (!empty)
beginResetModel();
- m_viewMode = vm;
+ m_viewMode = viewMode;
if (!empty)
endResetModel();
}
-void WidgetBoxCategoryListView::addEntry(const QString& title, const QIcon& icon,
- const QString& className, const QString& tooltip)
+void SampleToolBoxGroupView::addEntry(const QString& title, const QIcon& icon,
+ const QString& className, const QString& tooltip)
{
m_model->addEntry(title, icon, className, tooltip);
}
-QVariant WidgetBoxCategoryModel::data(const QModelIndex& index, int role) const
+QVariant SampleToolBoxGroupModel::data(const QModelIndex& index, int role) const
{
const int row = index.row();
if (row < 0 || row >= m_items.size())
@@ -113,18 +111,18 @@ QVariant WidgetBoxCategoryModel::data(const QModelIndex& index, int role) const
return QVariant();
}
-Qt::ItemFlags WidgetBoxCategoryModel::flags(const QModelIndex& index) const
+Qt::ItemFlags SampleToolBoxGroupModel::flags(const QModelIndex& index) const
{
return Qt::ItemIsEnabled;
}
-int WidgetBoxCategoryModel::rowCount(const QModelIndex& /*parent*/) const
+int SampleToolBoxGroupModel::rowCount(const QModelIndex& /*parent*/) const
{
return m_items.size();
}
-void WidgetBoxCategoryModel::addEntry(const QString& title, const QIcon& icon,
- const QString& className, const QString& tooltip)
+void SampleToolBoxGroupModel::addEntry(const QString& title, const QIcon& icon,
+ const QString& className, const QString& tooltip)
{
Entry item;
item.title = title;
@@ -142,12 +140,12 @@ void WidgetBoxCategoryModel::addEntry(const QString& title, const QIcon& icon,
endInsertRows();
}
-WidgetBoxCategoryModel::Entry WidgetBoxCategoryModel::entryAt(const QModelIndex& index) const
+SampleToolBoxGroupModel::Entry SampleToolBoxGroupModel::entryAt(const QModelIndex& index) const
{
return entryAt(index.row());
}
-WidgetBoxCategoryModel::Entry WidgetBoxCategoryModel::entryAt(int row) const
+SampleToolBoxGroupModel::Entry SampleToolBoxGroupModel::entryAt(int row) const
{
if (row < 0 || row >= m_items.size())
return Entry();
@@ -155,12 +153,12 @@ WidgetBoxCategoryModel::Entry WidgetBoxCategoryModel::entryAt(int row) const
return m_items.at(row);
}
-// ---------------------- WidgetBoxCategoryListView
+// ---------------------- SampleToolBoxGroupView ----------------------------------------
-WidgetBoxCategoryListView::WidgetBoxCategoryListView(QWidget* parent)
+SampleToolBoxGroupView::SampleToolBoxGroupView(QWidget* parent)
: QListView(parent)
, m_proxyModel(new QSortFilterProxyModel(this))
- , m_model(new WidgetBoxCategoryModel(this))
+ , m_model(new SampleToolBoxGroupModel(this))
{
setFocusPolicy(Qt::NoFocus);
setFrameShape(QFrame::NoFrame);
@@ -172,37 +170,37 @@ WidgetBoxCategoryListView::WidgetBoxCategoryListView(QWidget* parent)
setResizeMode(QListView::Adjust);
setUniformItemSizes(true);
- connect(this, &QListView::pressed, this, &WidgetBoxCategoryListView::slotPressed);
+ connect(this, &QListView::pressed, this, &SampleToolBoxGroupView::slotPressed);
m_proxyModel->setSourceModel(m_model);
m_proxyModel->setFilterRole(FILTER_ROLE);
setModel(m_proxyModel);
}
-void WidgetBoxCategoryListView::setViewMode(ViewMode vm)
+void SampleToolBoxGroupView::setViewMode(ViewMode vm)
{
QListView::setViewMode(vm);
m_model->setViewMode(vm);
}
-void WidgetBoxCategoryListView::slotPressed(const QModelIndex& index)
+void SampleToolBoxGroupView::slotPressed(const QModelIndex& index)
{
const auto entry = m_model->entryAt(m_proxyModel->mapToSource(index));
emit pressed(entry.title, entry.className, QCursor::pos());
}
-int WidgetBoxCategoryListView::count(AccessMode am) const
+int SampleToolBoxGroupView::count(AccessMode accessMode) const
{
- return am == FILTERED ? m_proxyModel->rowCount() : m_model->rowCount();
+ return accessMode == FILTERED ? m_proxyModel->rowCount() : m_model->rowCount();
}
-int WidgetBoxCategoryListView::mapRowToSource(int filterRow) const
+int SampleToolBoxGroupView::mapRowToSource(int filterRow) const
{
const QModelIndex filterIndex = m_proxyModel->index(filterRow, 0);
return m_proxyModel->mapToSource(filterIndex).row();
}
-void WidgetBoxCategoryListView::filter(const QRegExp& re)
+void SampleToolBoxGroupView::filter(const QRegExp& re)
{
m_proxyModel->setFilterRegExp(re);
}
diff --git a/GUI/Views/widgetbox/widgetboxcategorylistview.h b/GUI/Views/widgetbox/SampleToolBoxGroupView.h
similarity index 67%
rename from GUI/Views/widgetbox/widgetboxcategorylistview.h
rename to GUI/Views/widgetbox/SampleToolBoxGroupView.h
index bb29bdfd321d0d5e2a06c6be9151e5fc67a81532..dc40451993c8655321d54f72f4294885fad08c8e 100644
--- a/GUI/Views/widgetbox/widgetboxcategorylistview.h
+++ b/GUI/Views/widgetbox/SampleToolBoxGroupView.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/widgetbox/widgetboxcategorylistview.h
-//! @brief Defines class WidgetBoxCategoryListView
+//! @file GUI/Views/widgetbox/SampleToolBoxGroupView.h
+//! @brief Defines class SampleToolBoxGroupView
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,23 +12,23 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_WIDGETBOXCATEGORYLISTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_WIDGETBOXCATEGORYLISTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXGROUPVIEW_H
+#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXGROUPVIEW_H
#include <QListView>
class QSortFilterProxyModel;
-class WidgetBoxCategoryModel;
+class SampleToolBoxGroupModel;
-// List view of a category, switchable between icon and list mode.
-// Provides a filtered view.
-class WidgetBoxCategoryListView : public QListView {
+// View of a group inside the SampleToolBox, switchable between icon and list mode.
+// Provides also a filtered view.
+class SampleToolBoxGroupView : public QListView {
Q_OBJECT
public:
// Whether to access the filtered or unfiltered view
enum AccessMode { FILTERED, UNFILTERED };
- explicit WidgetBoxCategoryListView(QWidget* parent = 0);
+ explicit SampleToolBoxGroupView(QWidget* parent = 0);
void setViewMode(ViewMode vm);
using QListView::contentsSize;
@@ -39,19 +39,18 @@ public:
void addEntry(const QString& title, const QIcon& icon, const QString& className,
const QString& tooltip);
+ void filter(const QRegExp& re);
+
signals:
void pressed(const QString& name, const QString& className, const QPoint& globalPos);
-public slots:
- void filter(const QRegExp& re);
-
-private slots:
+private:
void slotPressed(const QModelIndex& index);
+ int mapRowToSource(int filterRow) const;
private:
- int mapRowToSource(int filterRow) const;
QSortFilterProxyModel* m_proxyModel;
- WidgetBoxCategoryModel* m_model;
+ SampleToolBoxGroupModel* m_model;
};
-#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_WIDGETBOXCATEGORYLISTVIEW_H
+#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXGROUPVIEW_H
diff --git a/GUI/Views/widgetbox/widgetboxtreewidget.cpp b/GUI/Views/widgetbox/widgetboxtreewidget.cpp
index 73268ab6383d4c44771bfb95b04c59cd71637018..2e57a9e178914c3276a2fd66bf3737102f42bb44 100644
--- a/GUI/Views/widgetbox/widgetboxtreewidget.cpp
+++ b/GUI/Views/widgetbox/widgetboxtreewidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/widgetbox/widgetboxtreewidget.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/widgetbox/widgetboxcategorylistview.h"
+#include "GUI/Views/widgetbox/SampleToolBoxGroupView.h"
// shared
#include "GUI/Views/widgetbox/sheet_delegate_p.h"
@@ -46,12 +46,12 @@ WidgetBoxTreeWidget::WidgetBoxTreeWidget(QWidget* parent) : QTreeWidget(parent),
SLOT(handleMousePress(QTreeWidgetItem*)));
}
-WidgetBoxCategoryListView* WidgetBoxTreeWidget::categoryViewAt(int idx) const
+SampleToolBoxGroupView* WidgetBoxTreeWidget::categoryViewAt(int idx) const
{
- WidgetBoxCategoryListView* rc = nullptr;
+ SampleToolBoxGroupView* rc = nullptr;
if (QTreeWidgetItem* cat_item = topLevelItem(idx))
if (QTreeWidgetItem* embedItem = cat_item->child(0))
- rc = qobject_cast<WidgetBoxCategoryListView*>(itemWidget(embedItem, 0));
+ rc = qobject_cast<SampleToolBoxGroupView*>(itemWidget(embedItem, 0));
ASSERT(rc);
return rc;
}
@@ -74,12 +74,11 @@ void WidgetBoxTreeWidget::handleMousePress(QTreeWidgetItem* item)
}
}
-WidgetBoxCategoryListView* WidgetBoxTreeWidget::addCategoryView(QTreeWidgetItem* parent,
- bool iconMode)
+SampleToolBoxGroupView* WidgetBoxTreeWidget::addCategoryView(QTreeWidgetItem* parent, bool iconMode)
{
QTreeWidgetItem* embed_item = new QTreeWidgetItem(parent);
embed_item->setFlags(Qt::ItemIsEnabled);
- WidgetBoxCategoryListView* categoryView = new WidgetBoxCategoryListView(this);
+ SampleToolBoxGroupView* categoryView = new SampleToolBoxGroupView(this);
categoryView->setViewMode(iconMode ? QListView::IconMode : QListView::ListMode);
connect(categoryView, SIGNAL(pressed(QString, QString, QPoint)), this,
SIGNAL(pressed(QString, QString, QPoint)));
@@ -93,8 +92,8 @@ void WidgetBoxTreeWidget::adjustSubListSize(QTreeWidgetItem* cat_item)
if (embedItem == nullptr)
return;
- WidgetBoxCategoryListView* list_widget =
- static_cast<WidgetBoxCategoryListView*>(itemWidget(embedItem, 0));
+ SampleToolBoxGroupView* list_widget =
+ static_cast<SampleToolBoxGroupView*>(itemWidget(embedItem, 0));
list_widget->setFixedWidth(header()->width());
list_widget->doItemsLayout();
const int height = qMax(list_widget->contentsSize().height(), 1);
@@ -120,7 +119,7 @@ void WidgetBoxTreeWidget::updateViewMode()
for (int i = numTopLevels - 1; i >= 0; --i) {
const QListView::ViewMode viewMode =
m_iconMode ? QListView::IconMode : QListView::ListMode;
- WidgetBoxCategoryListView* categoryView = categoryViewAt(i);
+ SampleToolBoxGroupView* categoryView = categoryViewAt(i);
if (viewMode != categoryView->viewMode()) {
categoryView->setViewMode(viewMode);
adjustSubListSize(topLevelItem(i));
@@ -174,11 +173,11 @@ void WidgetBoxTreeWidget::filter(const QString& f)
bool changed = false;
for (int i = 0; i < numTopLevels; i++) {
QTreeWidgetItem* tl = topLevelItem(i);
- WidgetBoxCategoryListView* categoryView = categoryViewAt(i);
+ SampleToolBoxGroupView* categoryView = categoryViewAt(i);
// Anything changed? -> Enable the category
- const int oldCount = categoryView->count(WidgetBoxCategoryListView::FILTERED);
+ const int oldCount = categoryView->count(SampleToolBoxGroupView::FILTERED);
categoryView->filter(re);
- const int newCount = categoryView->count(WidgetBoxCategoryListView::FILTERED);
+ const int newCount = categoryView->count(SampleToolBoxGroupView::FILTERED);
if (oldCount != newCount) {
changed = true;
const bool categoryEnabled = newCount > 0 || empty;
@@ -214,7 +213,7 @@ void WidgetBoxTreeWidget::addEntry(const QString& title, const QIcon& icon,
const auto cat_idx = topLevelItemCount() - 1;
QTreeWidgetItem* cat_item = topLevelItem(cat_idx);
- WidgetBoxCategoryListView* categoryView = categoryViewAt(cat_idx);
+ SampleToolBoxGroupView* categoryView = categoryViewAt(cat_idx);
categoryView->addEntry(title, icon, className, tooltip);
adjustSubListSize(cat_item);
diff --git a/GUI/Views/widgetbox/widgetboxtreewidget.h b/GUI/Views/widgetbox/widgetboxtreewidget.h
index aa3a9f9162b97cb7eedecde4f9f9a9c4aa99085a..99c83e57de0718926400eeb89087067af62fe14b 100644
--- a/GUI/Views/widgetbox/widgetboxtreewidget.h
+++ b/GUI/Views/widgetbox/widgetboxtreewidget.h
@@ -17,7 +17,7 @@
#include <QTreeWidget>
-class WidgetBoxCategoryListView;
+class SampleToolBoxGroupView;
//! A tree of categories
class WidgetBoxTreeWidget : public QTreeWidget {
@@ -49,8 +49,8 @@ private slots:
void slotIconMode();
private:
- WidgetBoxCategoryListView* addCategoryView(QTreeWidgetItem* parent, bool iconMode);
- WidgetBoxCategoryListView* categoryViewAt(int idx) const;
+ SampleToolBoxGroupView* addCategoryView(QTreeWidgetItem* parent, bool iconMode);
+ SampleToolBoxGroupView* categoryViewAt(int idx) const;
void adjustSubListSize(QTreeWidgetItem* cat_item);
void updateViewMode();