4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Improve/refactor autoconfig/settings service UI

Browse source 
Makes it so that services can have custom handling on a per-service
basis.  The bottom part of the service pane is now a stacked widget
which can now be customized for different types of services
(particularly OAuth services).
This commit is contained in:
jp9000 2019-02-06 19:19:17 -08:00
commit 24bcfacea5
9 changed files with 864 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

33
UI/window-basic-auto-config.cpp
View file

@ -223,6 +223,16 @@ AutoConfigStreamPage::AutoConfigStreamPage(QWidget *parent)
ui->bitrateLabel->setVisible(false);
ui->bitrate->setVisible(false);
int vertSpacing = ui->topLayout->verticalSpacing();
QMargins m = ui->topLayout->contentsMargins();
m.setBottom(vertSpacing / 2);
ui->topLayout->setContentsMargins(m);
m = ui->streamkeyPageLayout->contentsMargins();
m.setTop(vertSpacing / 2);
ui->streamkeyPageLayout->setContentsMargins(m);
setTitle(QTStr("Basic.AutoConfig.StreamPage"));
setSubTitle(QTStr("Basic.AutoConfig.StreamPage.SubTitle"));
@ -378,11 +388,11 @@ void AutoConfigStreamPage::ServiceChanged()
if (service == "Twitch" && wiz->twitchAuto)
regionBased = false;
ui->formLayout->removeWidget(ui->serverLabel);
ui->formLayout->removeWidget(ui->serverStackedWidget);
ui->streamkeyPageLayout->removeWidget(ui->serverLabel);
ui->streamkeyPageLayout->removeWidget(ui->serverStackedWidget);
if (custom) {
ui->formLayout->insertRow(1, ui->serverLabel,
ui->streamkeyPageLayout->insertRow(1, ui->serverLabel,
ui->serverStackedWidget);
ui->region->setVisible(false);
@ -391,7 +401,7 @@ void AutoConfigStreamPage::ServiceChanged()
ui->serverLabel->setVisible(true);
} else {
if (!testBandwidth)
ui->formLayout->insertRow(2, ui->serverLabel,
ui->streamkeyPageLayout->insertRow(2, ui->serverLabel,
ui->serverStackedWidget);
ui->region->setVisible(regionBased && testBandwidth);
@ -474,12 +484,6 @@ void AutoConfigStreamPage::LoadServices(bool showAll)
for (QString &name : names)
ui->service->addItem(name);
if (!lastService.isEmpty()) {
int idx = ui->service->findText(lastService);
if (idx != -1)
ui->service->setCurrentIndex(idx);
}
if (!showAll) {
ui->service->addItem(
QTStr("Basic.AutoConfig.StreamPage.Service.ShowAll"),
@ -490,6 +494,12 @@ void AutoConfigStreamPage::LoadServices(bool showAll)
QTStr("Basic.AutoConfig.StreamPage.Service.Custom"),
QVariant((int)ListOpt::Custom));
if (!lastService.isEmpty()) {
int idx = ui->service->findText(lastService);
if (idx != -1)
ui->service->setCurrentIndex(idx);
}
obs_properties_destroy(props);
ui->service->blockSignals(false);
@ -573,7 +583,7 @@ AutoConfig::AutoConfig(QWidget *parent)
#ifdef _WIN32
setWizardStyle(QWizard::ModernStyle);
#endif
AutoConfigStreamPage *streamPage = new AutoConfigStreamPage();
streamPage = new AutoConfigStreamPage();
setPage(StartPage, new AutoConfigStartPage());
setPage(VideoPage, new AutoConfigVideoPage());
@ -637,6 +647,7 @@ AutoConfig::AutoConfig(QWidget *parent)
streamPage->UpdateServerList();
streamPage->UpdateKeyLink();
streamPage->lastService.clear();
if (!customServer) {
QComboBox *serverList = streamPage->ui->server;