Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-06-21 12:03:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reuse last import path

Browse Source
This commit is contained in:
WarmUpTill 2022-12-22 19:59:41 +01:00 committed by WarmUpTill
parent ffccc435ca
commit 0027ae9bb8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/general.cpp
View File

@ -1,5 +1,6 @@
#include "advanced-scene-switcher.hpp"
#include "status-control.hpp"
#include "file-selection.hpp"
#include "utility.hpp"
#include "version.h"
@ -321,20 +322,20 @@ void AdvSceneSwitcher::on_importSettings_clicked()
bool start = !switcher->stop;
switcher->Stop();
QString desktopPath = QStandardPaths::writableLocation(
QStandardPaths::DesktopLocation);
QString directory = QFileDialog::getOpenFileName(
auto basePath = FileSelection::ValidPathOrDesktop(
QString::fromStdString(switcher->lastImportPath));
QString path = QFileDialog::getOpenFileName(
this,
tr(obs_module_text(
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle")),
desktopPath,
basePath,
tr(obs_module_text(
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType")));
if (directory.isEmpty()) {
if (path.isEmpty()) {
return;
}
QFile file(directory);
QFile file(path);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
return;
}
@ -351,6 +352,7 @@ void AdvSceneSwitcher::on_importSettings_clicked()
std::lock_guard<std::mutex> lock(switcher->m);
switcher->loadSettings(obj);
obs_data_release(obj);
switcher->lastImportPath = path.toStdString();
(void)DisplayMessage(obs_module_text(
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess"));
@ -640,6 +642,7 @@ void SwitcherData::saveGeneralSettings(obs_data_t *obj)
adjustActiveTransitionType);
obs_data_set_bool(obj, "adjustActiveTransitionType",
adjustActiveTransitionType);
obs_data_set_string(obj, "lastImportPath", lastImportPath.c_str());
}
void SwitcherData::loadGeneralSettings(obs_data_t *obj)
@ -720,6 +723,8 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
obs_data_get_bool(obj, "tansitionOverrideOverride");
adjustActiveTransitionType =
obs_data_get_bool(obj, "adjustActiveTransitionType");
lastImportPath = obs_data_get_string(obj, "lastImportPath");
}
void saveSplitterPos(QList<int> &sizes, obs_data_t *obj, const std::string name)

1
src/switcher-data-structs.hpp
View File

@ -85,6 +85,7 @@ struct SwitcherData {
bool settingsWindowOpened = false;
int lastOpenedTab = -1;
std::string lastImportPath;
bool firstBoot = true;
std::condition_variable cv;