Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to hide empty name warning in ItemSettingsDialog #1302

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Add option to hide empty name warning in ItemSettingsDialog #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f5b134
Add option to hide empty name warning in ItemSettingsDialog
WarmUpTill Jan 29, 2025
59cbaae
Display failure if Twitch token account name cannot be fetched
WarmUpTill Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/queue/action-queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ ActionQueueSettingsDialog::ActionQueueSettingsDialog(QWidget *parent,
"AdvSceneSwitcher.actionQueues.select",
"AdvSceneSwitcher.actionQueues.add",
"AdvSceneSwitcher.actionQueues.nameNotAvailable",
parent),
true, parent),
_queueRunStatus(new QLabel()),
_startStopToggle(new QPushButton()),
_queueSize(new QLabel()),
Expand Down
4 changes: 3 additions & 1 deletion lib/utils/item-selection-helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ ItemSettingsDialog::ItemSettingsDialog(const Item &settings,
std::string_view select,
std::string_view add,
std::string_view nameConflict,
bool showNameEmptyWarning,
QWidget *parent)
: QDialog(parent),
_name(new QLineEdit()),
Expand All @@ -274,7 +275,8 @@ ItemSettingsDialog::ItemSettingsDialog(const Item &settings,
_items(items),
_selectStr(select),
_addStr(add),
_conflictStr(nameConflict)
_conflictStr(nameConflict),
_showNameEmptyWarning(showNameEmptyWarning)
{
setModal(true);
setWindowModality(Qt::WindowModality::WindowModal);
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/item-selection-helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ItemSettingsDialog : public QDialog {
std::string_view addString = "AdvSceneSwitcher.item.add",
std::string_view conflictString =
"AdvSceneSwitcher.item.nameNotAvailable",
QWidget *parent = 0);
bool showEmptyNameWarning = true, QWidget *parent = 0);
virtual ~ItemSettingsDialog() = default;

private slots:
Expand Down
3 changes: 2 additions & 1 deletion lib/variables/variable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ VariableSettingsDialog::VariableSettingsDialog(QWidget *parent,
: ItemSettingsDialog(settings, variables,
"AdvSceneSwitcher.variable.select",
"AdvSceneSwitcher.variable.add",
"AdvSceneSwitcher.item.nameNotAvailable", parent),
"AdvSceneSwitcher.item.nameNotAvailable", true,
parent),
_value(new ResizingPlainTextEdit(this)),
_defaultValue(new ResizingPlainTextEdit(this)),
_save(new QComboBox())
Expand Down
3 changes: 2 additions & 1 deletion plugins/base/utils/connection-manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ WSConnectionSettingsDialog::WSConnectionSettingsDialog(
: ItemSettingsDialog(settings, connections,
"AdvSceneSwitcher.connection.select",
"AdvSceneSwitcher.connection.add",
"AdvSceneSwitcher.item.nameNotAvailable", parent),
"AdvSceneSwitcher.item.nameNotAvailable", true,
parent),
_useCustomURI(new QCheckBox()),
_customUri(new QLineEdit()),
_address(new QLineEdit()),
Expand Down
34 changes: 22 additions & 12 deletions plugins/twitch/token.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
"AdvSceneSwitcher.twitchToken.select",
"AdvSceneSwitcher.twitchToken.add",
"AdvSceneSwitcher.twitchToken.nameNotAvailable",
parent),
false, parent),
_requestToken(new QPushButton(
obs_module_text("AdvSceneSwitcher.twitchToken.request"))),
_showToken(new QPushButton()),
Expand All @@ -456,7 +456,6 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog(
_currentTokenValue->setText(QString::fromStdString(settings._token));

_name->setReadOnly(true);
_showNameEmptyWarning = false;

QWidget::connect(_requestToken, SIGNAL(clicked()), this,
SLOT(RequestToken()));
Expand Down Expand Up @@ -682,22 +681,33 @@ void TwitchTokenSettingsDialog::RequestToken()
void TwitchTokenSettingsDialog::GotToken(const std::optional<QString> &value)
{
_currentTokenValue->setText(value.value_or(""));
if (value.has_value()) {
if (!value) {
_tokenStatus->setText(obs_module_text(
"AdvSceneSwitcher.twitchToken.request.success"));
_currentToken.SetToken(value.value().toStdString());
auto name = QString::fromStdString(_currentToken._name);
_name->setText(name);
_name->textEdited(name);
QMetaObject::invokeMethod(this, "NameChanged",
Q_ARG(const QString &, name));
SetTokenInfoVisible(true);
} else {
"AdvSceneSwitcher.twitchToken.request.fail"));
_name->setText("");
SetTokenInfoVisible(false);
_requestToken->setEnabled(true);
return;
}

_currentToken.SetToken(value.value().toStdString());
auto name = QString::fromStdString(_currentToken._name);
if (name.isEmpty()) {
_tokenStatus->setText(obs_module_text(
"AdvSceneSwitcher.twitchToken.request.fail"));
_name->setText("");
SetTokenInfoVisible(false);
_requestToken->setEnabled(true);
return;
}

_tokenStatus->setText(obs_module_text(
"AdvSceneSwitcher.twitchToken.request.success"));
_name->setText(name);
_name->textEdited(name);
QMetaObject::invokeMethod(this, "NameChanged",
Q_ARG(const QString &, name));
SetTokenInfoVisible(true);
_requestToken->setEnabled(true);
}

Expand Down
Loading