OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-08 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Replace SIGNAL and SLOT macros in properties-view

Browse source
This commit is contained in:
gxalpha 2023-03-15 03:01:52 +01:00
parent e467f17501
commit e8147a9abb
No known key found for this signature in database
GPG key ID: 470184116E317811
3 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
UI/properties-view.cpp
View file

@ -262,13 +262,14 @@ void OBSPropertiesView::resizeEvent(QResizeEvent *event)
VScrollArea::resizeEvent(event);
}
QWidget *OBSPropertiesView::NewWidget(obs_property_t *prop, QWidget *widget,
const char *signal)
template<typename Sender, typename SenderParent, typename... Args>
QWidget *OBSPropertiesView::NewWidget(obs_property_t *prop, Sender *widget,
void (SenderParent::*signal)(Args...))
{
const char *long_desc = obs_property_long_description(prop);
WidgetInfo *info = new WidgetInfo(this, prop, widget);
connect(widget, signal, info, SLOT(ControlChanged()));
QObject::connect(widget, signal, info, &WidgetInfo::ControlChanged);
children.emplace_back(info);
widget->setToolTip(QT_UTF8(long_desc));
@ -283,7 +284,7 @@ QWidget *OBSPropertiesView::AddCheckbox(obs_property_t *prop)
QCheckBox *checkbox = new QCheckBox(QT_UTF8(desc));
checkbox->setCheckState(val ? Qt::Checked : Qt::Unchecked);
return NewWidget(prop, checkbox, SIGNAL(stateChanged(int)));
return NewWidget(prop, checkbox, &QCheckBox::stateChanged);
}
QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout,
@ -298,7 +299,7 @@ QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout,
OBSPlainTextEdit *edit = new OBSPlainTextEdit(this, monospace);
edit->setPlainText(QT_UTF8(val));
edit->setTabStopDistance(40);
return NewWidget(prop, edit, SIGNAL(textChanged()));
return NewWidget(prop, edit, &OBSPlainTextEdit::textChanged);
} else if (type == OBS_TEXT_PASSWORD) {
QLayout *subLayout = new QHBoxLayout();
@ -326,8 +327,8 @@ QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout,
edit->setToolTip(QT_UTF8(obs_property_long_description(prop)));
connect(edit, SIGNAL(textEdited(const QString &)), info,
SLOT(ControlChanged()));
connect(edit, &QLineEdit::textEdited, info,
&WidgetInfo::ControlChanged);
return nullptr;
} else if (type == OBS_TEXT_INFO) {
QString desc = QT_UTF8(obs_property_description(prop));
@ -380,7 +381,7 @@ QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout,
edit->setText(QT_UTF8(val));
edit->setToolTip(QT_UTF8(obs_property_long_description(prop)));
return NewWidget(prop, edit, SIGNAL(textEdited(const QString &)));
return NewWidget(prop, edit, &QLineEdit::textEdited);
}
void OBSPropertiesView::AddPath(obs_property_t *prop, QFormLayout *layout,
@ -406,7 +407,8 @@ void OBSPropertiesView::AddPath(obs_property_t *prop, QFormLayout *layout,
subLayout->addWidget(button);
WidgetInfo *info = new WidgetInfo(this, prop, edit);
connect(button, SIGNAL(clicked()), info, SLOT(ControlChanged()));
connect(button, &QPushButton::clicked, info,
&WidgetInfo::ControlChanged);
children.emplace_back(info);
*label = new QLabel(QT_UTF8(obs_property_description(prop)));
@ -450,13 +452,14 @@ void OBSPropertiesView::AddInt(obs_property_t *prop, QFormLayout *layout,
slider->setEnabled(obs_property_enabled(prop));
subLayout->addWidget(slider);
connect(slider, SIGNAL(valueChanged(int)), spin,
SLOT(setValue(int)));
connect(spin, SIGNAL(valueChanged(int)), slider,
SLOT(setValue(int)));
connect(slider, &QSlider::valueChanged, spin,
&QSpinBox::setValue);
connect(spin, &QSpinBox::valueChanged, slider,
&QSlider::setValue);
}
connect(spin, SIGNAL(valueChanged(int)), info, SLOT(ControlChanged()));
connect(spin, &QSpinBox::valueChanged, info,
&WidgetInfo::ControlChanged);
subLayout->addWidget(spin);
@ -506,14 +509,14 @@ void OBSPropertiesView::AddFloat(obs_property_t *prop, QFormLayout *layout,
slider->setOrientation(Qt::Horizontal);
subLayout->addWidget(slider);
connect(slider, SIGNAL(doubleValChanged(double)), spin,
SLOT(setValue(double)));
connect(spin, SIGNAL(valueChanged(double)), slider,
SLOT(setDoubleVal(double)));
connect(slider, &DoubleSlider::doubleValChanged, spin,
&QDoubleSpinBox::setValue);
connect(spin, &QDoubleSpinBox::valueChanged, slider,
&DoubleSlider::setDoubleVal);
}
connect(spin, SIGNAL(valueChanged(double)), info,
SLOT(ControlChanged()));
connect(spin, &QDoubleSpinBox::valueChanged, info,
&WidgetInfo::ControlChanged);
subLayout->addWidget(spin);
@ -637,9 +640,8 @@ QWidget *OBSPropertiesView::AddList(obs_property_t *prop, bool &warning)
WidgetInfo *info = new WidgetInfo(
this, prop, buttonGroup->buttons()[0]);
children.emplace_back(info);
connect(buttonGroup,
SIGNAL(buttonClicked(QAbstractButton *)), info,
SLOT(ControlChanged()));
connect(buttonGroup, &QButtonGroup::buttonClicked, info,
&WidgetInfo::ControlChanged);
}
QWidget *widget = new QWidget();
@ -667,8 +669,7 @@ QWidget *OBSPropertiesView::AddList(obs_property_t *prop, bool &warning)
}
if (type == OBS_COMBO_TYPE_EDITABLE)
return NewWidget(prop, combo,
SIGNAL(editTextChanged(const QString &)));
return NewWidget(prop, combo, &QComboBox::editTextChanged);
if (idx != -1)
combo->setCurrentIndex(idx);
@ -693,8 +694,8 @@ QWidget *OBSPropertiesView::AddList(obs_property_t *prop, bool &warning)
model->flags(model->index(idx, 0)) == Qt::NoItemFlags;
WidgetInfo *info = new WidgetInfo(this, prop, combo);
connect(combo, SIGNAL(currentIndexChanged(int)), info,
SLOT(ControlChanged()));
connect(combo, &QComboBox::currentIndexChanged, info,
&WidgetInfo::ControlChanged);
children.emplace_back(info);
/* trigger a settings update if the index was not found */
@ -744,8 +745,8 @@ void OBSPropertiesView::AddEditableList(obs_property_t *prop,
WidgetInfo *info = new WidgetInfo(this, prop, list);
list->setDragDropMode(QAbstractItemView::InternalMove);
connect(list->model(), SIGNAL(rowsMoved()), info,
SLOT(EditListReordered()));
connect(list->model(), &QAbstractItemModel::rowsMoved,
[info]() { info->EditableListChanged(); });
QVBoxLayout *sideLayout = new QVBoxLayout();
NewButton(sideLayout, info, "addIconSmall", &WidgetInfo::EditListAdd);
@ -776,7 +777,7 @@ QWidget *OBSPropertiesView::AddButton(obs_property_t *prop)
QPushButton *button = new QPushButton(QT_UTF8(desc));
button->setProperty("themeID", "settingsButtons");
button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
return NewWidget(prop, button, SIGNAL(clicked()));
return NewWidget(prop, button, &QPushButton::clicked);
}
void OBSPropertiesView::AddColorInternal(obs_property_t *prop,
@ -825,7 +826,8 @@ void OBSPropertiesView::AddColorInternal(obs_property_t *prop,
subLayout->addWidget(button);
WidgetInfo *info = new WidgetInfo(this, prop, colorLabel);
connect(button, SIGNAL(clicked()), info, SLOT(ControlChanged()));
connect(button, &QPushButton::clicked, info,
&WidgetInfo::ControlChanged);
children.emplace_back(info);
label = new QLabel(QT_UTF8(obs_property_description(prop)));
@ -913,7 +915,8 @@ void OBSPropertiesView::AddFont(obs_property_t *prop, QFormLayout *layout,
subLayout->addWidget(button);
WidgetInfo *info = new WidgetInfo(this, prop, fontLabel);
connect(button, SIGNAL(clicked()), info, SLOT(ControlChanged()));
connect(button, &QPushButton::clicked, info,
&WidgetInfo::ControlChanged);
children.emplace_back(info);
label = new QLabel(QT_UTF8(obs_property_description(prop)));
@ -1522,7 +1525,8 @@ void OBSPropertiesView::AddGroup(obs_property_t *prop, QFormLayout *layout)
children.emplace_back(info);
// Signals
connect(groupBox, SIGNAL(toggled(bool)), info, SLOT(ControlChanged()));
connect(groupBox, &QGroupBox::toggled, info,
&WidgetInfo::ControlChanged);
}
void OBSPropertiesView::AddProperty(obs_property_t *property,
@ -1998,11 +2002,6 @@ void WidgetInfo::GroupChanged(const char *setting)
: true);
}
void WidgetInfo::EditListReordered()
{
EditableListChanged();
}
void WidgetInfo::EditableListChanged()
{
const char *setting = obs_property_name(property);
@ -2226,8 +2225,10 @@ public:
setLayout(mainLayout);
resize(QSize(400, 80));
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(buttonBox, &QDialogButtonBox::accepted, this,
&EditableItemDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this,
&EditableItemDialog::reject);
}
inline QString GetText() const { return edit->text(); }

6
UI/properties-view.hpp
View file

@ -79,7 +79,6 @@ public slots:
void EditListEdit();
void EditListUp();
void EditListDown();
void EditListReordered();
};
/* ------------------------------------------------------------------------- */
@ -109,8 +108,9 @@ private:
QWidget *lastWidget = nullptr;
bool deferUpdate;
QWidget *NewWidget(obs_property_t *prop, QWidget *widget,
const char *signal);
template<typename Sender, typename SenderParent, typename... Args>
QWidget *NewWidget(obs_property_t *prop, Sender *widget,
void (SenderParent::*signal)(Args...));
QWidget *AddCheckbox(obs_property_t *prop);
QWidget *AddText(obs_property_t *prop, QFormLayout *layout,

4
UI/window-basic-properties.cpp
View file

@ -84,8 +84,8 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
ui->propertiesLayout->addWidget(view);
if (type == OBS_SOURCE_TYPE_TRANSITION) {
connect(view, SIGNAL(PropertiesRefreshed()), this,
SLOT(AddPreviewButton()));
connect(view, &OBSPropertiesView::PropertiesRefreshed, this,
&OBSBasicProperties::AddPreviewButton);
}
view->show();