mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-17 02:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Adjustments to Add Source window

Browse Source
This commit is contained in:
Warchamp7
2026-07-14 20:17:32 -04:00
committed by Ryan Foster
parent 6750a6e9f5
commit f730063da3
4 changed files with 187 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
frontend/dialogs/OBSBasicSourceSelect.cpp
View File

@@ -255,9 +255,9 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, undo_stack &undo_s)
connect(ui->existingScrollArea->horizontalScrollBar(), &QScrollBar::valueChanged, this,
&OBSBasicSourceSelect::updateButtonVisibility);
ui->createNewFrame->setVisible(false);
ui->deprecatedCreateLabel->setVisible(false);
ui->deprecatedCreateLabel->setProperty("class", "text-muted");
ui->createNewSource->setVisible(false);
ui->noExistingLabel->setVisible(false);
ui->deprecatedFrame->setVisible(false);
rebuildSourceTypeList();
refreshSources();
@@ -272,16 +272,16 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, undo_stack &undo_s)
connect(ui->sourceTypeList, &QListWidget::itemDoubleClicked, this, &OBSBasicSourceSelect::createNew);
connect(ui->sourceTypeList, &QListWidget::currentItemChanged, this, &OBSBasicSourceSelect::sourceTypeSelected);
connect(ui->newSourceName, &QLineEdit::returnPressed, this, &OBSBasicSourceSelect::createNew);
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
connect(ui->addExistingButton, &QAbstractButton::clicked, this, &OBSBasicSourceSelect::addSelectedSources);
connect(this, &OBSBasicSourceSelect::selectedItemsChanged, this, [this]() {
ui->addExistingButton->setEnabled(selectedItems.size() > 0);
if (selectedItems.size() > 0) {
ui->addExistingButton->setText(QTStr("Add %1 Existing").arg(selectedItems.size()));
ui->addExistingButton->setText(
QTStr("Basic.SourceSelect.AddExisting").arg(selectedItems.size()));
} else {
ui->addExistingButton->setText("Add Existing");
ui->addExistingButton->setText(QTStr("Basic.SourceSelect.NoSelection"));
}
});
@@ -537,6 +537,13 @@ void OBSBasicSourceSelect::rebuildSourceTypeList()
ui->sourceTypeList->sortItems();
auto *deprecatedTitle = new QListWidgetItem(ui->sourceTypeList);
deprecatedTitle->setText(QTStr("Deprecated"));
deprecatedTitle->setFlags(deprecatedTitle->flags() & ~Qt::ItemIsEnabled);
deprecatedTitle->setFlags(deprecatedTitle->flags() & ~Qt::ItemIsSelectable);
ui->sourceTypeList->addItem(deprecatedTitle);
// Shift Deprecated sources to the bottom
QList<QListWidgetItem *> deprecatedItems;
for (int i = 0; i < ui->sourceTypeList->count(); ++i) {
@@ -732,10 +739,6 @@ void OBSBasicSourceSelect::createNew()
{
bool visible = ui->sourceVisible->isChecked();
if (ui->newSourceName->text().isEmpty()) {
return;
}
if (selectedTypeId.compare(kRecentTypeId) == 0) {
return;
}
@@ -746,7 +749,8 @@ void OBSBasicSourceSelect::createNew()
std::string sourceType = selectedTypeId.toStdString();
const char *id = sourceType.c_str();
std::string newName = ui->newSourceName->text().toStdString();
QString placeholder = getDisplayNameForSourceType(selectedTypeId);
std::string newName = getNewSourceName(placeholder.toStdString().c_str());
std::optional<OBSSource> createResult = setupNewSource(this, id, newName.c_str());
if (!createResult.has_value()) {
@@ -779,7 +783,7 @@ void OBSBasicSourceSelect::createNew()
OBSDataAutoRelease wrapper = obs_data_create();
obs_data_set_string(wrapper, "id", id);
obs_data_set_int(wrapper, "item_id", obs_sceneitem_get_id(item));
obs_data_set_string(wrapper, "name", ui->newSourceName->text().toUtf8().constData());
obs_data_set_string(wrapper, "name", newName.c_str());
obs_data_set_bool(wrapper, "visible", visible);
auto redo = [sceneUuid](const std::string &data) {
@@ -808,7 +812,7 @@ void OBSBasicSourceSelect::createNew()
obs_sceneitem_set_id(item, static_cast<int64_t>(obs_data_get_int(dat, "item_id")));
};
undo_s.add_action(QTStr("Undo.Add").arg(ui->newSourceName->text()), undo, redo,
undo_s.add_action(QTStr("Undo.Add").arg(QString::fromStdString(newName)), undo, redo,
std::string(obs_source_get_uuid(newSource)), std::string(obs_data_get_json(wrapper)));
main->CreatePropertiesWindow(newSource);
@@ -910,9 +914,15 @@ void OBSBasicSourceSelect::sourceTypeSelected(QListWidgetItem *current, QListWid
QVariant unversionedIdData = current->data(kUnversionedIdRole);
QVariant deprecatedData = current->data(kDeprecatedRole);
bool isDeprecatedType = deprecatedData.toBool();
ui->deprecatedFrame->setVisible(isDeprecatedType);
if (unversionedIdData.toString().compare(kRecentTypeId) == 0) {
ui->sourceSelectTitle->setText(QTStr("Basic.SourceSelect.Recent"));
selectedTypeId = kRecentTypeId.toString();
ui->createNewFrame->setVisible(false);
ui->noExistingLabel->setVisible(false);
ui->existingScrollArea->setVisible(true);
ui->createNewSource->setVisible(false);
updateExistingSources(kRecentListLimit);
return;
}
@@ -922,31 +932,21 @@ void OBSBasicSourceSelect::sourceTypeSelected(QListWidgetItem *current, QListWid
return;
}
ui->createNewFrame->setVisible(true);
bool isDeprecatedType = deprecatedData.toBool();
ui->deprecatedCreateLabel->setVisible(isDeprecatedType);
ui->createNewSource->setVisible(type != "scene");
selectedTypeId = type;
QString placeHolderText{getDisplayNameForSourceType(selectedTypeId)};
QString text{placeHolderText};
int i = 2;
OBSSourceAutoRelease source = nullptr;
while ((source = obs_get_source_by_name(QT_TO_UTF8(text)))) {
text = QString("%1 %2").arg(placeHolderText).arg(i++);
}
ui->newSourceName->setText(text);
ui->createNewSource->setText(
QTStr("Basic.SourceSelect.NewSource").arg(getDisplayNameForSourceType(selectedTypeId)));
ui->sourceSelectTitle->setText(QString("%1").arg(getDisplayNameForSourceType(selectedTypeId)));
updateExistingSources();
if (existingFlowLayout->count() == 0) {
QLabel *noExisting = new QLabel();
noExisting->setText(
QTStr("Basic.SourceSelect.NoExisting").arg(getDisplayNameForSourceType(selectedTypeId)));
noExisting->setProperty("class", "text-muted");
existingFlowLayout->addWidget(noExisting);
}
ui->noExistingLabel->setText(
QTStr("Basic.SourceSelect.NoExisting").arg(getDisplayNameForSourceType(selectedTypeId)));
ui->existingScrollArea->setVisible(existingFlowLayout->count() != 0);
ui->noExistingLabel->setVisible(existingFlowLayout->count() == 0);
}