From 119fac17bf2b9f7c6ddf295c631c2dbb183b4a71 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Thu, 2 Apr 2026 22:06:51 +0200 Subject: [PATCH] Cleanup * Member access * Refresh settings on show to ensure "repeat" changes are visible --- plugins/base/macro-condition-date.cpp | 6 ++++++ plugins/base/macro-condition-date.hpp | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/plugins/base/macro-condition-date.cpp b/plugins/base/macro-condition-date.cpp index ed2b0262..166042a6 100644 --- a/plugins/base/macro-condition-date.cpp +++ b/plugins/base/macro-condition-date.cpp @@ -710,6 +710,12 @@ void MacroConditionDateEdit::UpdateEntryData() SetWidgetStatus(); } +void MacroConditionDateEdit::showEvent(QShowEvent *event) +{ + const QSignalBlocker b(this); + UpdateEntryData(); +} + void MacroConditionDateEdit::SetupSimpleView() { SetLayoutVisible(_simpleLayout, true); diff --git a/plugins/base/macro-condition-date.hpp b/plugins/base/macro-condition-date.hpp index 6eca4c05..6c143658 100644 --- a/plugins/base/macro-condition-date.hpp +++ b/plugins/base/macro-condition-date.hpp @@ -107,6 +107,16 @@ signals: void HeaderInfoChanged(const QString &); protected: + void showEvent(QShowEvent *event) override; + +private: + void SetupSimpleView(); + void SetupAdvancedView(); + void SetupPatternView(); + void SetWidgetStatus(); + void ShowFirstDateSelection(bool visible); + void ShowSecondDateSelection(bool visible); + QComboBox *_weekCondition; DayOfWeekSelector *_days; QCheckBox *_ignoreWeekTime; @@ -134,16 +144,9 @@ protected: QHBoxLayout *_repeatUpdateLayout; QHBoxLayout *_patternLayout; - std::shared_ptr _entryData; - -private: - void SetupSimpleView(); - void SetupAdvancedView(); - void SetupPatternView(); - void SetWidgetStatus(); - void ShowFirstDateSelection(bool visible); - void ShowSecondDateSelection(bool visible); QTimer _timer; + + std::shared_ptr _entryData; bool _loading = true; };