diff --git a/config-dialog.cpp b/config-dialog.cpp index e898081..681c7a3 100644 --- a/config-dialog.cpp +++ b/config-dialog.cpp @@ -284,6 +284,18 @@ OBSBasicSettings::OBSBasicSettings(CanvasDock *canvas_dock, QMainWindow *parent) streamingLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); streamingLayout->setLabelAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter); + // Multistream is active, show warning + auto multistream_warning_widget = new QGroupBox(obs_frontend_get_locale_string("Warning")); + auto multistream_warning_layout = new QVBoxLayout; + multistream_warning_widget->setStyleSheet("QGroupBox { background: #332701; border: 1px solid #997404; color: #ffda6a; padding-top: 16px; }"); + + auto multistream_warning_label = new QLabel(QString::fromUtf8(obs_module_text("OutputsMulistream"))); + multistream_warning_label->setStyleSheet("color: #ffda6a; font-weight: bold;"); + + multistream_warning_layout->addWidget(multistream_warning_label); + multistream_warning_widget->setLayout(multistream_warning_layout); + + auto streaming_title_layout = new QHBoxLayout; auto streaming_title = new QLabel(QString::fromUtf8(obs_module_text("Streaming"))); streaming_title->setStyleSheet(QString::fromUtf8("font-weight: bold;")); @@ -295,9 +307,7 @@ OBSBasicSettings::OBSBasicSettings(CanvasDock *canvas_dock, QMainWindow *parent) streamingLayout->addRow(streaming_title_layout); - if (canvasDock->disable_stream_settings) { - streamingLayout->addRow(new QLabel(QString::fromUtf8(obs_module_text("OutputsMulistream")))); - } else { + if (!canvasDock->disable_stream_settings) { auto hl = new QHBoxLayout; auto addButton = new QPushButton(QIcon(QString::fromUtf8(":/res/images/plus.svg")), QString::fromUtf8(obs_frontend_get_locale_string("Add"))); @@ -493,6 +503,13 @@ OBSBasicSettings::OBSBasicSettings(CanvasDock *canvas_dock, QMainWindow *parent) vb = new QVBoxLayout; vb->setContentsMargins(0, 0, 0, 0); + + // multistream is active, show warning + if (canvasDock->disable_stream_settings) + { + vb->addWidget(multistream_warning_widget); + } + vb->addWidget(streamingGroup); vb->addWidget(streamingAdvancedGroup); vb->addWidget(streamingDelayGroup); diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 5934747..eb91dc6 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -69,4 +69,4 @@ VirtualCameraModeMain="Main" VirtualCameraModeBoth="Both" StreamingMatchMain="Start and stop streaming when main OBS starts and stops streaming" RecordingMatchMain="Start and stop recording when main OBS starts and stops recording" -OutputsMulistream="The streaming outputs are controlled by Aitum Multistream" +OutputsMulistream="As you are using Aitum Multistream, you must control Vertical streaming outputs from the Aitum Multistream Settings.\nChanging Output settings is disabled here."