Merge pull request #1703 from cg2121/preview-program-labels

UI: Add preview/program labels in studio mode
This commit is contained in:
Colin Edwards
2019-03-03 22:42:38 -06:00
committed by GitHub
12 changed files with 126 additions and 14 deletions

View File

@@ -371,6 +371,17 @@ OBSBasic::OBSBasic(QWidget *parent)
QPoint statsDockPos = curSize / 2 - statsDockSize / 2;
QPoint newPos = curPos + statsDockPos;
statsDock->move(newPos);
ui->previewLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
ui->previewLabel->setProperty("themeID", "previewProgramLabels");
bool labels = config_get_bool(GetGlobalConfig(),
"BasicWindow", "StudioModeLabels");
if (!previewProgramMode)
ui->previewLabel->setHidden(true);
else
ui->previewLabel->setHidden(!labels);
}
static void SaveAudioDevice(const char *name, int channel, obs_data_t *parent,
@@ -3437,10 +3448,19 @@ void OBSBasic::ResetUI()
bool studioPortraitLayout = config_get_bool(GetGlobalConfig(),
"BasicWindow", "StudioPortraitLayout");
bool labels = config_get_bool(GetGlobalConfig(),
"BasicWindow", "StudioModeLabels");
if (studioPortraitLayout)
ui->previewLayout->setDirection(QBoxLayout::TopToBottom);
else
ui->previewLayout->setDirection(QBoxLayout::LeftToRight);
if (previewProgramMode)
ui->previewLabel->setHidden(!labels);
if (programLabel)
programLabel->setHidden(!labels);
}
int OBSBasic::ResetVideo()