From e76c4d3d33cc563204f48694b788cb5641da11b0 Mon Sep 17 00:00:00 2001 From: David Marsh Date: Thu, 18 Jul 2024 17:08:16 +0100 Subject: [PATCH] Kick Service --- data/locale/en-US.ini | 8 ++++ output-dialog.cpp | 108 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 12c3d97..9d9e7e5 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -86,3 +86,11 @@ TwitterServer="X (Twitter) Server" TwitterServerInfo="Pick your closest X (Twitter) ingest server." TwitterStreamKey="X (Twitter) Stream Key" TwitterStreamKeyInfo="Please enter your stream key, you can find this in your X (Twitter) Producer page." + +# Kick Output Dialog +KickOutput="Kick Output" +KickServiceInfo="Please complete the following fields to add a new Kick output." +KickServer="Kick Server" +KickServerInfo="The stream server URL is preset for Kick, you do not need to change it." +KickStreamKey="Kick Stream Key" +KickStreamKeyInfo="Please enter your stream key, you can find this in your Kick Creator Dashboard." diff --git a/output-dialog.cpp b/output-dialog.cpp index 80e4f4f..dc18a47 100644 --- a/output-dialog.cpp +++ b/output-dialog.cpp @@ -200,14 +200,116 @@ QWidget *OutputDialog::WizardServicePage() { QWidget *OutputDialog::WizardInfoKick() { auto page = new QWidget(this); - - auto pageLayout = new QVBoxLayout; + page->setStyleSheet("padding: 0px; margin: 0px;"); - auto title = new QLabel(QString("Kick Service page")); + // Layout + auto pageLayout = new QVBoxLayout; + pageLayout->setSpacing(12); + + // Heading + auto title = new QLabel(QString::fromUtf8(obs_module_text("KickServiceInfo"))); + title->setWordWrap(true); + title->setTextFormat(Qt::RichText); pageLayout->addWidget(title); + // Content + auto contentLayout = new QVBoxLayout; + + // Confirm button - initialised here so we can set state in form input connects + auto confirmButton = generateButton(QString("Create Output")); + + // Form + auto formLayout = new QFormLayout; + formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); + formLayout->setLabelAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter); + formLayout->setSpacing(12); + + // Output name + auto outputNameField = new QLineEdit; + outputNameField->setText(QString::fromUtf8(obs_module_text("KickOutput"))); + outputNameField->setStyleSheet("padding: 4px 8px;"); + + connect(outputNameField, &QLineEdit::textEdited, [this, outputNameField, confirmButton] { + outputName = outputNameField->text(); + validateOutputs(confirmButton); + }); + + formLayout->addRow(generateFormLabel("OutputName"), outputNameField); + + // Server field + auto serverSelection = new QLineEdit; + serverSelection->setText("rtmps://fa723fc1b171.global-contribute.live-video.net"); + serverSelection->setDisabled(true); + serverSelection->setStyleSheet("padding: 4px 8px;"); + +// connect(serverSelection, &QLineEdit::textEdited, [this, serverSelection, confirmButton] { +// outputServer = serverSelection->text(); +// validateOutputs(confirmButton); +// }); + + formLayout->addRow(generateFormLabel("KickServer"), serverSelection); + + // Server info + formLayout->addWidget(generateInfoLabel("KickServerInfo")); + + // Server key + auto outputKeyField = new QLineEdit; + outputKeyField->setStyleSheet("padding: 4px 8px;"); + connect(outputKeyField, &QLineEdit::textEdited, [this, outputKeyField, confirmButton] { + outputKey = outputKeyField->text(); + validateOutputs(confirmButton); + }); + + formLayout->addRow(generateFormLabel("KickStreamKey"), outputKeyField); + + // Server key info + formLayout->addWidget(generateInfoLabel("KickStreamKeyInfo")); + + contentLayout->addLayout(formLayout); + + // spacing + auto spacer = new QSpacerItem(1, 20, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding); + contentLayout->addSpacerItem(spacer); + + pageLayout->addLayout(contentLayout); + + // Controls + auto controlsLayout = new QHBoxLayout; + controlsLayout->setSpacing(12); + + // back button + auto serviceButton = generateButton(QString("< Back")); + + connect(serviceButton, &QPushButton::clicked, [this] { + stackedWidget->setCurrentIndex(0); + resetOutputs(); + }); + + controlsLayout->addWidget(serviceButton, 0); + controlsLayout->addStretch(1); + + // confirm button (initialised above so we can set state) + connect(confirmButton, &QPushButton::clicked, [this] { + acceptOutputs(); + }); + + controlsLayout->addWidget(confirmButton, 0); + + // Hook it all together + pageLayout->addLayout(controlsLayout); page->setLayout(pageLayout); + // Defaults for when we're changed to + connect(stackedWidget, &QStackedWidget::currentChanged, [this, outputNameField, serverSelection, outputKeyField, confirmButton] { + if (stackedWidget->currentIndex() == 1) { + outputName = outputNameField->text(); + outputServer = serverSelection->text(); + outputKey = outputKeyField->text(); + validateOutputs(confirmButton); + } + }); + + return page; }