Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-19 16:47:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add option to not save remaining time

Browse Source
This commit is contained in:
WarmUpTill 2021-10-25 19:34:55 +02:00 committed by WarmUpTill
parent 8b9f03a349
commit 9bc59c1082
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/en-US.ini
View File

@ -157,7 +157,7 @@ AdvSceneSwitcher.condition.timer.pause="Pause"
AdvSceneSwitcher.condition.timer.continue="Continue"
AdvSceneSwitcher.condition.timer.entry.line1="{{duration}} have passed"
AdvSceneSwitcher.condition.timer.entry.line2="Time remaining: {{remaining}} seconds"
AdvSceneSwitcher.condition.timer.entry.line3="{{pauseContinue}} {{reset}} {{autoReset}} Automatically reset timer after duration was reached"
AdvSceneSwitcher.condition.timer.entry.line3="{{pauseContinue}} {{reset}} {{saveRemaining}} Save time remaining {{autoReset}} Automatically reset timer after duration was reached"
AdvSceneSwitcher.condition.timer.reset="Reset"
AdvSceneSwitcher.condition.macro="Macro"
AdvSceneSwitcher.condition.macro.type.count="Count"

3
src/headers/macro-condition-timer.hpp
View File

@ -22,6 +22,7 @@ public:
Duration _duration;
bool _paused = false;
bool _saveRemaining = false;
double _remaining = 0.;
bool _oneshot = false;
@ -49,6 +50,7 @@ public:
private slots:
void DurationChanged(double seconds);
void DurationUnitChanged(DurationUnit unit);
void SaveRemainingChanged(int state);
void AutoResetChanged(int state);
void PauseContinueClicked();
void ResetClicked();
@ -59,6 +61,7 @@ protected:
DurationSelection *_duration;
QCheckBox *_autoReset;
QCheckBox *_saveRemaining;
QPushButton *_reset;
QPushButton *_pauseConinue;
QLabel *_remaining;

23
src/macro-condition-timer.cpp
View File

@ -31,7 +31,12 @@ bool MacroConditionTimer::Save(obs_data_t *obj)
if (!_paused) {
_remaining = _duration.TimeRemaining();
}
obs_data_set_double(obj, "remaining", _remaining);
if (_saveRemaining) {
obs_data_set_double(obj, "remaining", _remaining);
} else {
obs_data_set_double(obj, "remaining", _duration.seconds);
}
obs_data_set_bool(obj, "saveRemaining", _saveRemaining);
obs_data_set_bool(obj, "paused", _paused);
obs_data_set_bool(obj, "oneshot", _oneshot);
return true;
@ -43,6 +48,7 @@ bool MacroConditionTimer::Load(obs_data_t *obj)
_duration.Load(obj);
_remaining = obs_data_get_double(obj, "remaining");
_paused = obs_data_get_bool(obj, "paused");
_saveRemaining = obs_data_get_bool(obj, "saveRemaining");
if (!obs_data_has_user_value(obj, "oneshot")) {
_oneshot = false;
} else {
@ -80,6 +86,7 @@ MacroConditionTimerEdit::MacroConditionTimerEdit(
{
_duration = new DurationSelection();
_autoReset = new QCheckBox();
_saveRemaining = new QCheckBox();
_pauseConinue = new QPushButton(
obs_module_text("AdvSceneSwitcher.condition.timer.pause"));
_reset = new QPushButton(
@ -95,6 +102,8 @@ MacroConditionTimerEdit::MacroConditionTimerEdit(
QWidget::connect(_reset, SIGNAL(clicked()), this, SLOT(ResetClicked()));
QWidget::connect(_autoReset, SIGNAL(stateChanged(int)), this,
SLOT(AutoResetChanged(int)));
QWidget::connect(_saveRemaining, SIGNAL(stateChanged(int)), this,
SLOT(SaveRemainingChanged(int)));
auto line1Layout = new QHBoxLayout;
std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
@ -103,6 +112,7 @@ MacroConditionTimerEdit::MacroConditionTimerEdit(
{"{{remaining}}", _remaining},
{"{{pauseContinue}}", _pauseConinue},
{"{{reset}}", _reset},
{"{{saveRemaining}}", _saveRemaining},
};
placeWidgets(
obs_module_text("AdvSceneSwitcher.condition.timer.entry.line1"),
@ -150,6 +160,16 @@ void MacroConditionTimerEdit::DurationUnitChanged(DurationUnit unit)
_entryData->_duration.displayUnit = unit;
}
void MacroConditionTimerEdit::SaveRemainingChanged(int state)
{
if (_loading || !_entryData) {
return;
}
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_saveRemaining = state;
}
void MacroConditionTimerEdit::AutoResetChanged(int state)
{
if (_loading || !_entryData) {
@ -225,5 +245,6 @@ void MacroConditionTimerEdit::UpdateEntryData()
_duration->SetDuration(_entryData->_duration);
_autoReset->setChecked(!_entryData->_oneshot);
_saveRemaining->setChecked(_entryData->_saveRemaining);
SetPauseContinueButtonLabel();
}