Don't emit dueDateChanged() when dayChanged() is emitted

Otherwise causes task revision to change each time flow starts. Use a different signal so QML can change due date's color when day changes to today.
iamsergio · Apr 23, 2016 · a106255 · a106255
1 parent 22d3a7b
commit a106255
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/task.cpp b/src/task.cpp
@@ -79,6 +79,8 @@ Task::Task(Kernel *kernel, const QString &summary)
     connect(this, &Task::dueDateChanged, &Task::onEdited);
     connect(this, &Task::priorityChanged, &Task::onEdited);
 
+    connect(this, &Task::dueDateChanged, &Task::dueDateDisplayTextChanged);
+
     connect(kernel, &Kernel::dayChanged, this, &Task::onDayChanged);
 
 #if defined(UNIT_TEST_RUN)
@@ -530,7 +532,7 @@ void Task::onEdited()
 void Task::onDayChanged()
 {
     if (m_dueDate.isValid()) {
-        emit dueDateChanged();
+        emit dueDateDisplayTextChanged();
         if (dueToday() || isOverdue())
             setStaged(true);
     }

diff --git a/src/task.h b/src/task.h
@@ -58,12 +58,12 @@ class Task : public QObject, public Syncable {
     Q_PROPERTY(bool isUrl READ isUrl NOTIFY summaryChanged)
     Q_PROPERTY(QString priorityStr READ priorityStr NOTIFY priorityChanged)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
-    Q_PROPERTY(bool dueToday READ dueToday NOTIFY dueDateChanged)
-    Q_PROPERTY(bool isOverdue READ isOverdue NOTIFY dueDateChanged)
-    Q_PROPERTY(QString prettyDueDateString READ prettyDueDateString NOTIFY dueDateChanged)
-    Q_PROPERTY(QString prettyDueDateRecurString READ prettyDueDateRecurString NOTIFY dueDateChanged)
-    Q_PROPERTY(QString dueDateString READ dueDateString NOTIFY dueDateChanged)
-    Q_PROPERTY(QDate dueDate READ dueDate WRITE setDueDate NOTIFY dueDateChanged)
+    Q_PROPERTY(bool dueToday READ dueToday NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(bool isOverdue READ isOverdue NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString prettyDueDateString READ prettyDueDateString NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString prettyDueDateRecurString READ prettyDueDateRecurString NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString dueDateString READ dueDateString NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QDate dueDate READ dueDate WRITE setDueDate NOTIFY dueDateDisplayTextChanged)
     Q_PROPERTY(int daysSinceLastPomodoro READ daysSinceLastPomodoro NOTIFY daysSinceLastPomodoroChanged)
     Q_PROPERTY(int daysSinceCreation READ daysSinceCreation NOTIFY daysSinceCreationChanged)
     Q_PROPERTY(bool staged READ staged WRITE setStaged NOTIFY stagedChanged)
@@ -78,10 +78,10 @@ class Task : public QObject, public Syncable {
 
     Q_PROPERTY(TaskContextMenuModel* contextMenuModel READ contextMenuModel CONSTANT)
     Q_PROPERTY(SortedTaskContextMenuModel* sortedContextMenuModel READ sortedContextMenuModel CONSTANT)
-    Q_PROPERTY(int periodType READ periodType NOTIFY dueDateChanged)
-    Q_PROPERTY(bool recurs READ recurs NOTIFY dueDateChanged)
-    Q_PROPERTY(uint frequency READ frequency WRITE setFrequency NOTIFY dueDateChanged)
-    Q_PROPERTY(QString frequencyWord READ frequencyWord NOTIFY dueDateChanged)
+    Q_PROPERTY(int periodType READ periodType NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(bool recurs READ recurs NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(uint frequency READ frequency WRITE setFrequency NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString frequencyWord READ frequencyWord NOTIFY dueDateDisplayTextChanged)
 
 public:
     typedef QSharedPointer<Task> Ptr;
@@ -204,6 +204,7 @@ public Q_SLOTS:
     void changed();
     void tagToggled(const QString &tag);
     void dueDateChanged();
+    void dueDateDisplayTextChanged();
 
 protected:
     QVector<QString> supportedFields() const Q_DECL_OVERRIDE;