Mirrors/obs-aitum-multistream
1
0
Fork 0
mirror of https://github.com/Aitum/obs-aitum-multistream.git synced 2024-11-25 03:33:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP + Fix modality for output dialog

Browse Source
This commit is contained in:
David Marsh 2024-07-16 19:52:59 +01:00
parent f23729f109
commit 05e119702c
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config-dialog.cpp
View File

@ -168,6 +168,9 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
connect(addButtonTest, &QPushButton::clicked, [this] { connect(addButtonTest, &QPushButton::clicked, [this] {
auto outputDialog = new OutputDialog(this); auto outputDialog = new OutputDialog(this);
outputDialog->setWindowModality(Qt::WindowModal);
outputDialog->setModal(true);
if (outputDialog->exec() == QDialog::Accepted) { if (outputDialog->exec() == QDialog::Accepted) {
// got a result // got a result
blog(LOG_WARNING, "[Aitum Multistream] output accepted"); blog(LOG_WARNING, "[Aitum Multistream] output accepted");

5
data/locale/en-US.ini
View File

@ -11,7 +11,7 @@ MainOutput="Main Output"
MainEncoder="Main Encoder" MainEncoder="Main Encoder"
SetupTroubleshooter="Setup Troubleshooter" SetupTroubleshooter="Setup Troubleshooter"
Help="Help" Help="Help"
AddOutput="AddOutput" AddOutput="Add Output"
Unnamed="Unnamed" Unnamed="Unnamed"
Version="Version" Version="Version"
MadeBy="made with ♡ by" MadeBy="made with ♡ by"
@ -28,3 +28,6 @@ NewVersion="New version (%1) available <a href='https://aitum.tv/download/multi/
NoVerticalWarning="The Vertical plugin is not installed, or you are using an older version." NoVerticalWarning="The Vertical plugin is not installed, or you are using an older version."
SettingsMainCanvasTitle="Main Canvas" SettingsMainCanvasTitle="Main Canvas"
SettingsMainCanvasDescription="You can manage your Main Canvas (the default canvas) settings here. \nPlease note that to change your Built-in Output settings, you need to do this from within the normal OBS settings." SettingsMainCanvasDescription="You can manage your Main Canvas (the default canvas) settings here. \nPlease note that to change your Built-in Output settings, you need to do this from within the normal OBS settings."
NewOutputWindowTitle="Aitum Multistream: Add New Output"
NewOutputSelectService="Please select the service/site that your new output will use. If your new service isn't listed, please select \"other\"."
OtherService="Other Service"

23
output-dialog.cpp
View File

@ -4,8 +4,11 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QLabel> #include <QLabel>
#include <QStackedWidget> #include <QStackedWidget>
#include "obs-module.h"
OutputDialog::OutputDialog(QDialog *parent) : QDialog(parent) { OutputDialog::OutputDialog(QDialog *parent) : QDialog(parent) {
setModal(true);
stackedWidget = new QStackedWidget; stackedWidget = new QStackedWidget;
// Service selection page // Service selection page
@ -23,6 +26,7 @@ OutputDialog::OutputDialog(QDialog *parent) : QDialog(parent) {
stackedWidget->setCurrentIndex(0); stackedWidget->setCurrentIndex(0);
setWindowTitle(obs_module_text("NewOutputWindowTitle"));
auto stackedLayout = new QVBoxLayout; auto stackedLayout = new QVBoxLayout;
stackedLayout->addWidget(stackedWidget); stackedLayout->addWidget(stackedWidget);
@ -40,8 +44,23 @@ QWidget *OutputDialog::WizardServicePage() {
auto pageLayout = new QVBoxLayout; auto pageLayout = new QVBoxLayout;
auto title = new QLabel(QString("This is my title")); auto description = new QLabel(QString::fromUtf8(obs_module_text("NewOutputSelectService")));
pageLayout->addWidget(title); pageLayout->addWidget(description);
// layout for service selection
auto gap = 8;
auto selectionLayout = new QVBoxLayout;
selectionLayout->setSpacing(gap);
// row 1
auto rowOne = new QHBoxLayout;
// row 2
page->setLayout(pageLayout); page->setLayout(pageLayout);