lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 19.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2017-06-29 21:01:10 +02:00
parent 3708b8e092
commit 1f1bbb3518
534 changed files with 13862 additions and 2459 deletions
Download patch file Download diff file Expand all files Collapse all files

24
UI/window-basic-main-scene-collections.cpp
View file

@ -114,13 +114,13 @@ static bool GetSceneCollectionName(QWidget *parent, std::string &name,
return false;
}
if (name.empty()) {
QMessageBox::information(parent,
OBSMessageBox::information(parent,
QTStr("NoNameEntered.Title"),
QTStr("NoNameEntered.Text"));
continue;
}
if (SceneCollectionExists(name.c_str())) {
QMessageBox::information(parent,
OBSMessageBox::information(parent,
QTStr("NameExists.Title"),
QTStr("NameExists.Text"));
continue;
@ -221,10 +221,26 @@ void OBSBasic::RefreshSceneCollections()
EnumSceneCollections(addCollection);
/* force saving of first scene collection on first run, otherwise
* no scene collections will show up */
if (!count) {
long prevDisableVal = disableSaving;
disableSaving = 0;
SaveProjectNow();
disableSaving = prevDisableVal;
EnumSceneCollections(addCollection);
}
ui->actionRemoveSceneCollection->setEnabled(count > 1);
OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
main->OpenSavedProjectors();
main->ui->actionPasteFilters->setEnabled(false);
main->ui->actionPasteRef->setEnabled(false);
main->ui->actionPasteDup->setEnabled(false);
}
void OBSBasic::on_actionNewSceneCollection_triggered()
@ -314,7 +330,7 @@ void OBSBasic::on_actionRemoveSceneCollection_triggered()
QString text = QTStr("ConfirmRemove.Text");
text.replace("$1", QT_UTF8(oldName.c_str()));
QMessageBox::StandardButton button = QMessageBox::question(this,
QMessageBox::StandardButton button = OBSMessageBox::question(this,
QTStr("ConfirmRemove.Title"), text);
if (button == QMessageBox::No)
return;
@ -379,7 +395,7 @@ void OBSBasic::on_actionImportSceneCollection_triggered()
QFile::copy(file, path + filename);
RefreshSceneCollections();
} else {
QMessageBox::information(this,
OBSMessageBox::information(this,
QTStr("Basic.MainMenu.SceneCollection.Import"),
QTStr("Basic.MainMenu.SceneCollection.Exists"));
}