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

Add option to preserve original date in combination with repeat option

Browse Source
This commit is contained in:
WarmUpTill
2022-04-12 20:53:49 +02:00
committed by WarmUpTill
parent ff513d8664
commit e26f41a1a8
3 changed files with 121 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/headers/macro-condition-date.hpp
View File

@@ -37,12 +37,18 @@ public:
return std::make_shared<MacroConditionDate>(m);
}
void SetDate1(const QDate &date);
void SetDate2(const QDate &date);
void SetTime1(const QTime &time);
void SetTime2(const QTime &time);
QDateTime GetDateTime1();
QDateTime GetDateTime2();
DayOfWeekSelection _dayOfWeek = DayOfWeekSelection::ANY;
QDateTime _dateTime = QDateTime::currentDateTime();
QDateTime _dateTime2 = QDateTime::currentDateTime();
bool _ignoreDate = false;
bool _ignoreTime = false;
bool _repeat = false;
bool _updateOnRepeat = true;
Duration _duration;
DateCondition _condition = DateCondition::AT;
bool _dayOfWeekCheck = false;
@@ -51,6 +57,12 @@ private:
bool CheckDayOfWeek(int64_t);
bool CheckRegularDate(int64_t);
QDateTime _dateTime = QDateTime::currentDateTime();
QDateTime _dateTime2 = QDateTime::currentDateTime();
// Used depending whether or not _updateOnRepeat is set
QDateTime _origDateTime = QDateTime::currentDateTime();
QDateTime _origDateTime2 = QDateTime::currentDateTime();
static bool _registered;
static const std::string id;
};
@@ -81,6 +93,7 @@ private slots:
void IgnoreDateChanged(int state);
void IgnoreTimeChanged(int state);
void RepeatChanged(int state);
void UpdateOnRepeatChanged(int state);
void DurationChanged(double seconds);
void DurationUnitChanged(DurationUnit unit);
void AdvancedSettingsToggleClicked();
@@ -100,12 +113,13 @@ protected:
QCheckBox *_ignoreDate;
QCheckBox *_ignoreTime;
QCheckBox *_repeat;
QCheckBox *_updateOnRepeat;
DurationSelection *_duration;
QPushButton *_advancedSettingsTooggle;
QHBoxLayout *_simpleLayout;
QHBoxLayout *_advancedLayout;
QHBoxLayout *_repeatLayout;
QVBoxLayout *_repeatLayout;
std::shared_ptr<MacroConditionDate> _entryData;