diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp index d3105c54..c9580f28 100644 --- a/src/advanced-scene-switcher.cpp +++ b/src/advanced-scene-switcher.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -70,6 +71,34 @@ void AdvSceneSwitcher::loadUI() /****************************************************************************** * Saving and loading ******************************************************************************/ +void AskBackup(obs_data_t *obj) +{ + bool backupSettings = DisplayMessage( + obs_module_text("AdvSceneSwitcher.askBackup"), true); + + if (!backupSettings) { + return; + } + + QString directory = QFileDialog::getSaveFileName( + nullptr, + obs_module_text( + "AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle"), + QDir::currentPath(), + obs_module_text( + "AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType")); + if (directory.isEmpty()) { + return; + } + + QFile file(directory); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + return; + } + + obs_data_save_json(obj, file.fileName().toUtf8().constData()); +} + static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *) { if (saving) { @@ -94,7 +123,7 @@ static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *) obj = obs_data_create(); } if (switcher->versionChanged(obj, g_GIT_SHA1)) { - AdvSceneSwitcher::AskBackup(obj); + AskBackup(obj); } switcher->loadSettings(obj); diff --git a/src/general.cpp b/src/general.cpp index 4e903cb7..8e90871c 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -1,9 +1,9 @@ -#include - #include "headers/advanced-scene-switcher.hpp" #include "headers/utility.hpp" #include "headers/version.h" +#include + QMetaObject::Connection inactivePluse; void AdvSceneSwitcher::on_close_clicked() @@ -210,34 +210,6 @@ void AdvSceneSwitcher::on_uiHintsDisable_stateChanged(int state) switcher->disableHints = state; } -void AdvSceneSwitcher::AskBackup(obs_data_t *obj) -{ - bool backupSettings = DisplayMessage( - obs_module_text("AdvSceneSwitcher.askBackup"), true); - - if (!backupSettings) { - return; - } - - QString directory = QFileDialog::getSaveFileName( - nullptr, - obs_module_text( - "AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle"), - QDir::currentPath(), - obs_module_text( - "AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType")); - if (directory.isEmpty()) { - return; - } - - QFile file(directory); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - return; - } - - obs_data_save_json(obj, file.fileName().toUtf8().constData()); -} - void AdvSceneSwitcher::on_exportSettings_clicked() { QString directory = QFileDialog::getSaveFileName( diff --git a/src/headers/advanced-scene-switcher.hpp b/src/headers/advanced-scene-switcher.hpp index 519adc9b..fa23cb96 100644 --- a/src/headers/advanced-scene-switcher.hpp +++ b/src/headers/advanced-scene-switcher.hpp @@ -69,7 +69,6 @@ public: void setupMacroTab(); void setTabOrder(); void restoreWindowGeo(); - static void AskBackup(obs_data_t *obj); signals: void MacroAdded(const QString &name);