Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-05-05 20:36:33 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Show all feature tabs when setup wizard is skipped
Some checks are pending
debian-build / build (push) Waiting to run
Details
Push to master / Check Formatting 🔍 (push) Waiting to run
Details
Push to master / Build Project 🧱 (push) Waiting to run
Details
Push to master / Create Release 🛫 (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
WarmUpTill 2026-05-02 15:21:40 +02:00 committed by WarmUpTill
parent 4f3d9e3a00
commit 873e073eb6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/general.cpp
View File

@ -391,12 +391,16 @@ void AdvSceneSwitcher::CheckFirstTimeSetup()
return;
}
auto macro = FirstRunWizard::ShowWizard(this);
bool wasSkipped = false;
auto macro = FirstRunWizard::ShowWizard(this, &wasSkipped);
if (macro) {
renameMacroIfNecessary(macro);
QTimer::singleShot(0, this,
[this, macro]() { ui->macros->Add(macro); });
}
if (wasSkipped) {
ui->alwaysShowFeatureTabs->setChecked(true);
}
switcher->Start();
}

6
lib/utils/first-run-wizard.cpp
View File

@ -398,10 +398,14 @@ void FirstRunWizard::markFirstRunComplete()
}
// static
std::shared_ptr<Macro> FirstRunWizard::ShowWizard(QWidget *parent)
std::shared_ptr<Macro> FirstRunWizard::ShowWizard(QWidget *parent,
bool *wasSkipped)
{
auto wizard = new FirstRunWizard(parent);
wizard->exec();
if (wasSkipped) {
*wasSkipped = (wizard->result() == QDialog::Rejected);
}
wizard->deleteLater();
return wizard->_macro;
}

3
lib/utils/first-run-wizard.hpp
View File

@ -113,7 +113,8 @@ class FirstRunWizard : public QWizard {
Q_OBJECT
public:
explicit FirstRunWizard(QWidget *parent = nullptr);
static std::shared_ptr<Macro> ShowWizard(QWidget *parent);
static std::shared_ptr<Macro> ShowWizard(QWidget *parent,
bool *wasSkipped = nullptr);
static bool
CreateMacro(std::shared_ptr<Macro> &macro, const std::string &macroName,
const std::string &conditionId, obs_data_t *conditionData,