opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Create UI Validation Helper Class

Browse Source 
Pull UI validation and its helpers to their own class. This class will
be used to validate forms and perform UI-action checks such as
checking stream keys aren't empty and in this diff now holds the logic
to ensure there is a source before the person starts a stream.
This commit is contained in:
JohannMG
2019-12-11 01:23:36 -08:00
committed by jp9000
parent bcddf4ddbf
commit c4396e03a7
5 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main.cpp
+4 -46
View File
@@ -54,6 +54,7 @@
#include "display-helpers.hpp"
#include "volume-control.hpp"
#include "remote-text.hpp"
#include "ui-validation.hpp"
#include <fstream>
#include <sstream>
@@ -163,25 +164,6 @@ static void AddExtraModulePaths()
extern obs_frontend_callbacks *InitializeAPIInterface(OBSBasic *main);
static int CountVideoSources()
{
int count = 0;
auto countSources = [](void *param, obs_source_t *source) {
if (!source)
return true;
uint32_t flags = obs_source_get_output_flags(source);
if ((flags & OBS_SOURCE_VIDEO) != 0)
(*reinterpret_cast<int *>(param))++;
return true;
};
obs_enum_sources(countSources, &count);
return count;
}
void assignDockToggle(QDockWidget *dock, QAction *action)
{
auto handleWindowToggle = [action](bool vis) {
@@ -5600,7 +5582,7 @@ void OBSBasic::StartReplayBuffer()
if (disableOutputsRef)
return;
if (!NoSourcesConfirmation()) {
if (!UIValidation::NoSourcesConfirmation(this)) {
replayBufferButton->setChecked(false);
return;
}
@@ -5745,30 +5727,6 @@ void OBSBasic::ReplayBufferStop(int code)
OnDeactivate();
}
bool OBSBasic::NoSourcesConfirmation()
{
if (CountVideoSources() == 0 && isVisible()) {
QString msg;
msg = QTStr("NoSources.Text");
msg += "\n\n";
msg += QTStr("NoSources.Text.AddSource");
QMessageBox messageBox(this);
messageBox.setWindowTitle(QTStr("NoSources.Title"));
messageBox.setText(msg);
QAbstractButton *Yes = messageBox.addButton(
QTStr("Yes"), QMessageBox::YesRole);
messageBox.addButton(QTStr("No"), QMessageBox::NoRole);
messageBox.setIcon(QMessageBox::Question);
messageBox.exec();
if (messageBox.clickedButton() != Yes)
return false;
}
return true;
}
void OBSBasic::on_streamButton_clicked()
{
if (outputHandler->StreamingActive()) {
@@ -5791,7 +5749,7 @@ void OBSBasic::on_streamButton_clicked()
StopStreaming();
} else {
if (!NoSourcesConfirmation()) {
if (!UIValidation::NoSourcesConfirmation(this)) {
ui->streamButton->setChecked(false);
return;
}
@@ -5852,7 +5810,7 @@ void OBSBasic::on_recordButton_clicked()
}
StopRecording();
} else {
if (!NoSourcesConfirmation()) {
if (!UIValidation::NoSourcesConfirmation(this)) {
ui->recordButton->setChecked(false);
return;
}